Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -266,20 +266,30 @@ public class MyImportUtils {
         if (administrationType.length()>0){
             String[] split = administrationType.split(";");
             for (String str:split){
-                if (str.equals("2.农村政处")){
+                if (str.contains("农村政处")){
                     model.addAttribute("pass_construction3","0");
                 }
                 //2.民事政处/行政政处（公路/水利）
-                if (str.equals("3.民事政处/行政政处（公路/水利）")){
+                if (str.contains("民事政处/行政政处（公路/水利）")){
                     model.addAttribute("pass_construction4","0");
                 }
-                //3.行政政处（城区道路）
-                if (str.equals("4.行政政处（城区道路）")){
+                if (str.contains("行政政处（城区道路）")){
                     model.addAttribute("pass_construction5","0");
                 }
             }
         }
     }
+//     if (str.equals("2.农村政处")){
+//        model.addAttribute("pass_construction3","0");
+//    }
+//    //2.民事政处/行政政处（公路/水利）
+//                if (str.equals("3.民事政处/行政政处（公路/水利）")){
+//        model.addAttribute("pass_construction4","0");
+//    }
+//    //3.行政政处（城区道路）
+//                if (str.equals("4.行政政处（城区道路）")){
+//        model.addAttribute("pass_construction5","0");
+//    }
     //政策处理类型判断
     public static String getAdministrationJudge(Disclose disclose,String tips){
         if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null) {