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

zhongrj

2024-04-12 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a

 src/main/java/org/springblade/common/cache/SysCache.java

@@ -378,7 +378,7 @@


   /**
    * 查询综治网格相关的网格，社区编号集合
    * 查询综治网格/公安相关的网格，社区编号集合
    * @param deptId
    * @param communityCode
    * @param roleName
@@ -399,27 +399,30 @@
            List<String> list = new ArrayList<>();
            // 查询对应的区域编号code
            Dept dept = deptService.getById(id);
            // 只取综治的
            if (dept.getDeptNature() == 2) {
               if (null != dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()) {
//                  list = getGridRegionChildCodes(dept.getRegionCode(),communityCode,roleName);
                  if (dept.getRegionCode() == null) {
                     return;
                  }
                  list = CacheUtil.get(SYS_CACHE, REGION_CHILDCODES_CODE, finalKey, List.class);
                  if (list == null || list.size()==0) {
                     list = new ArrayList<>();
                     List<Region> deptChild = getGridRegionChild(dept.getRegionCode(),communityCode,roleName);
                     if (deptChild != null) {
                        List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
                        list.addAll(collect);
            if (null != dept) {
               if (
                  (roleName.equals("mj") && dept.getDeptNature()==1) ||
                  (
                     (roleName.equals("wgy") || roleName.equals("wzcj")) && dept.getDeptNature()==2
                  )
               ){
                  if (!AuthUtil.isAdministrator()) {
                     if (dept.getRegionCode() == null) {
                        return;
                     }
//                     finalRegionCodeList.add(dept.getRegionCode());
                  }

                  //行政区划不为空添加进集合
                  if (list.size() > 0) {
                     finalRegionCodeList.addAll(list);
                     list = CacheUtil.get(SYS_CACHE, REGION_CHILDCODES_CODE, finalKey, List.class);
                     if (list == null || list.size() == 0) {
                        list = new ArrayList<>();
                        List<Region> deptChild = getGridRegionChild(dept.getRegionCode(), communityCode, roleName);
                        if (deptChild != null) {
                           List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
                           list.addAll(collect);
                        }
                     }
                     //行政区划不为空添加进集合
                     if (list.size() > 0) {
                        finalRegionCodeList.addAll(list);
                     }
                  }
               }
            }