民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题

zhongrj

2024-04-12 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a

 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java

@@ -150,6 +150,9 @@
            return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
         }
      }
      if (region.getDeptNature()==2){
         region.setCityCode("361100");
      }
      // 非公安
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
   }
@@ -282,6 +285,13 @@
         // 查询综治区域集合
         List<Region> regionChildList = baseMapper.getGridRegionChildList(regionCode);
         list.addAll(regionChildList);
      }else if (!Strings.isBlank(roleName) && roleName.equals("mj")){
         // 查询公安相关的区域数据
         List<Region> regionList = baseMapper.getPoliceList(communityCode);
         if (regionList.size()>0) {
            List<Region> policeList = treeRegionList(regionList,regionCode, list);
            list.addAll(policeList);
         }
      }else {
         // 查询综治区域集合
         List<Region> regionChildList = baseMapper.getRegionChildList(regionCode, communityCode, roleName);
@@ -306,6 +316,10 @@
            //递归遍历下一级
            treeRegionList(regionList,region.getCode(),list);
         }
         if(region.getCode().equals(parentCode)){
            // 本身也加入
            list.add(region);
         }
      }
      return list;
   }