企业自查bug修改

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -511,15 +511,17 @@ public class TzsAppService {
                 if (!ValidationUtil.isEmpty(map.get("fieldValue"))) {
                     JSONArray jsonArray = JSON.parseArray(String.valueOf(map.get("fieldValue")));
                     JSONArray json = new JSONArray();
-                    for (Object obj : jsonArray) {
-                        JSONObject object = JSON.parseObject(JSON.toJSONString(obj));
-                        if (!ValidationUtil.isEmpty(object)) {
-                            object.getString("url");
-                            object.put("url", object.getString("url"));
-                            json.add(object);
+                    if (!ValidationUtil.isEmpty(jsonArray)) {
+                        for (Object obj : jsonArray) {
+                            JSONObject object = JSON.parseObject(JSON.toJSONString(obj));
+                            if (!ValidationUtil.isEmpty(object)) {
+                                object.getString("url");
+                                object.put("url", object.getString("url"));
+                                json.add(object);
+                            }
                         }
+                        array.addAll(json);
                     }
-                    array.addAll(json);
                 }
                 // 删除所有附件
                 iterator.remove();

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/ReginStepEnum.java

@@ -20,7 +20,7 @@ public enum ReginStepEnum {
     /**
      * 西咸新区
      */
-    XIXIAN("617000", "西咸新区", "map"),
+//    XIXIAN("617000", "西咸新区", "map"),
     /**
      * 韩城市
      */

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -107,7 +107,7 @@ public class StCommonServiceImpl {
     }
 
     private void initReginCode() {
-        Collection<RegionModel> result = Systemctl.regionClient.queryForTree(null).getResult();
+        Collection<RegionModel> result = Systemctl.regionClient.queryForTreeByAgencyCodeRightLike(null).getResult();
         result.forEach(r -> {
             RegionModel regionModel = new RegionModel();
             BeanUtil.copyProperties(r, regionModel);