Merge remote-tracking branch 'origin/master'

lin

2024-04-13 5497dd57b68dd7ef0ec5844e5f8c0816f7048f25

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

@@ -149,9 +149,10 @@
            // 查询公安对应的辖区树
            return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
         }
      }
      if (region.getDeptNature()==2){
         region.setCityCode("361100");
         // 综治的需要查到网格
         if (region.getDeptNature()==2){
            region.setCityCode("361100");
         }
      }
      // 非公安
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));