机构新增字段，警务网格字段调整

zhongrj

2024-02-02 30f7705239334a3df2c7a296fb11abd1b28355cb

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

@@ -35,6 +35,7 @@
import org.springblade.modules.system.mapper.RegionMapper;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -136,9 +137,17 @@
    * @return
    */
   @Override
   public List<TreeStringNode> getTree(RegionVO region) {
   public List<TreeStringNode> getTree(RegionParamVO region) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      if (null!=region.getDeptNature()){
         // 公安
         if (region.getDeptNature()==1){
            // 查询公安对应的辖区树
            return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
         }
      }
      // 非公安
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
   }