Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -694,11 +694,4 @@ public class TaskService {
     private String packRedisKey(String deptId) {
         return STS_CZRK_ + deptId + ":" + DateUtils.getDate();
     }
-
-    public static void main(String[] args) {
-        String s = "茶庄村涪陵组";
-        //获取村
-        String cun =  s.substring(0,s.indexOf("村"));
-        System.out.println(cun);
-    }
 }

boman-web-core/src/main/java/com/boman/web/core/utils/CzrkUtils.java

@@ -80,32 +80,42 @@ public class CzrkUtils {
                         if ("province".equals(roleKey)) {
                             if (type.equals(Czrk.HJ)) {
                                 czrk.setProvinceId(areaId);
+                                break;
                             } else {
                                 czrk.setProvinceIdXjd(areaId);
+                                break;
                             }
                         } else if ("city".equals(roleKey)) {
                             if (type.equals(Czrk.HJ)) {
                                 czrk.setCityId(areaId);
+                                break;
                             } else {
                                 czrk.setCityIdXjd(areaId);
+                                break;
                             }
                         } else if ("region".equals(roleKey)) {
                             if (type.equals(Czrk.HJ)) {
                                 czrk.setRegionId(areaId);
+                                break;
                             } else {
                                 czrk.setRegionIdXjd(areaId);
+                                break;
                             }
                         } else if ("villageTowns".equals(roleKey)) {
                             if (type.equals(Czrk.HJ)) {
                                 czrk.setVillageTownsId(areaId);
+                                break;
                             } else {
                                 czrk.setVillageTownsIdXjd(areaId);
+                                break;
                             }
                         } else if ("village".equals(roleKey)) {
                             if (type.equals(Czrk.HJ)) {
                                 czrk.setVillageId(areaId);
+                                break;
                             } else {
                                 czrk.setVillageIdXjd(areaId);
+                                break;
                             }
                         }
                     }