E呼即办2

linwe

2024-05-15 047ced202f052d70c50f4365b2d86810de076489

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

@@ -152,11 +152,17 @@
         }
         // 综治的需要查到网格
         if (region.getDeptNature()==2){
            region.setCityCode("361100");
            region.setCityCode("361102");
            region.setDistrictCode("361102");
         }
         // 综治的需要查到网格
         if (region.getDeptNature()==3){
            region.setDistrictCode("361102");
         }
      }
      // 非公安
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region, regionChildCodesList, isAdministrator));
      Map<String, TreeStringNode> treeList = baseMapper.getTreeList(region, regionChildCodesList, isAdministrator);
      return NodeTreeUtil.getStringNodeTree(treeList);
   }

   /**
@@ -341,4 +347,17 @@
      // 分割后es搜索才有效果,不能用逗号分割
      return String.join("\\",baseMapper.getAllCommunityNameListString(articleRange));
   }

   /**
    * 树列表-查询到社区的树
    * @return
    */
   @Override
   public List<TreeStringNode> treeToCommunity() {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(), null);
      Integer isAdministrator = AuthUtils.isAdministratorOrAdmin(AuthUtil.getUserRole()) == true ? 1 : 2;
      // 查询
      Map<String, TreeStringNode> treeList = baseMapper.treeToCommunity(regionChildCodesList, isAdministrator);
      return NodeTreeUtil.getStringNodeTree(treeList);
   }
}