Merge remote-tracking branch 'origin/master'

lin

2024-04-13 5497dd57b68dd7ef0ec5844e5f8c0816f7048f25

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

@@ -149,6 +149,10 @@
            // 查询公安对应的辖区树
            return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
         }
         // 综治的需要查到网格
         if (region.getDeptNature()==2){
            region.setCityCode("361100");
         }
      }
      // 非公安
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
@@ -282,6 +286,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 +317,10 @@
            //递归遍历下一级
            treeRegionList(regionList,region.getCode(),list);
         }
         if(region.getCode().equals(parentCode)){
            // 本身也加入
            list.add(region);
         }
      }
      return list;
   }