Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

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

@@ -141,7 +141,7 @@
    */
   @Override
   public List<TreeStringNode> getTree(RegionParamVO region) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      if (null!=region.getDeptNature()){
         // 公安
@@ -234,11 +234,11 @@
    * @return
    */
   @Override
   public List<Region> getRegionChild(String regionCode) {
   public List<Region> getRegionChild(String regionCode,String communityCode) {
      // 创建区域对象
      List<Region> list = new ArrayList<>();
      // 查询公安相关的区域数据
      List<Region> regionList = baseMapper.getPoliceList();
      List<Region> regionList = baseMapper.getPoliceList(communityCode);
      if (regionList.size()>0) {
         List<Region> policeList = treeRegionList(regionList,regionCode, list);
         list.addAll(policeList);
@@ -256,11 +256,11 @@
    * @return
    */
   @Override
   public List<Region> getPoliceRegionChild(String regionCode) {
   public List<Region> getPoliceRegionChild(String regionCode,String communityCode) {
      // 创建区域对象
      List<Region> list = new ArrayList<>();
      // 查询公安相关的区域数据
      List<Region> regionList = baseMapper.getPoliceList();
      List<Region> regionList = baseMapper.getPoliceList(communityCode);
      if (regionList.size()>0) {
         List<Region> policeList = treeRegionList(regionList,regionCode, list);
         list.addAll(policeList);