属地监管部门树修改

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

@@ -110,6 +110,9 @@ public class CommonServiceImpl implements ICommonService {
     //管辖机构redis缓存key
     private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
 
+    //管辖机构redis缓存key
+    private static final String REGULATOR_UNIT_TREE_ALL = "REGULATOR_UNIT_TREE_ALL";
+
     //行政审批局redis缓存key
     private static final String ADMINISTRATION_UNIT_TREE = "ADMINISTRATION_UNIT_TREE";
 
@@ -285,7 +288,7 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public List<LinkedHashMap> getCreatTreeByInstallation() {
-        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
+        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE_ALL);
         //判断redis是否存在管辖机构树
         return !ObjectUtils.isEmpty(result) ? result : getCreatTreeByInstallationTree();
     }
@@ -294,10 +297,10 @@ public class CommonServiceImpl implements ICommonService {
     public List<LinkedHashMap> getCreatTreeByInstallationTree() {
         FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
-        List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
+        List<LinkedHashMap> treeData = deleteData(result, REGULATOR_UNIT);
         List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
         List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
-        redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
+        redisUtils.set(REGULATOR_UNIT_TREE_ALL, resultTree);
         return resultTree;
     }
 
@@ -377,6 +380,21 @@ public class CommonServiceImpl implements ICommonService {
         return result;
     }
 
+    private List<LinkedHashMap> deleteData(List<LinkedHashMap> result,String companyType) {
+        Iterator it = result.iterator();
+        while (it.hasNext()) {
+            LinkedHashMap e = (LinkedHashMap) it.next();
+            // 删除非行政审批局
+            if (!e.get("companyType").toString().contains(companyType)) {
+                it.remove();
+            }
+            if (!ObjectUtils.isEmpty(e.get("children"))) {
+                deleteData((List<LinkedHashMap>) e.get("children"),companyType);
+            }
+        }
+        return result;
+    }
+
 
     @Override
     public List<Map<String, Object>> getUnitListByType(String type) {