From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index 4631ddf..03973d4 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/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()){
// 公安
@@ -149,6 +149,9 @@
// 查询公安对应的辖区树
return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
}
+ }
+ if (region.getDeptNature()==2){
+ region.setCityCode("361100");
}
// 非公安
return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
@@ -234,17 +237,17 @@
* @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);
}
// 查询综治区域集合
- List<Region> regionChildList = baseMapper.getRegionChildList(regionCode);
+ List<Region> regionChildList = baseMapper.getRegionChildList(regionCode,null,null);
list.addAll(regionChildList);
// 返回
return list;
@@ -256,14 +259,43 @@
* @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);
+ }
+ // 返回
+ return list;
+ }
+
+ /**
+ * 获取综治下级区域
+ * @param regionCode
+ * @return
+ */
+ @Override
+ public List<Region> getGridRegionChild(String regionCode, String communityCode, String roleName) {
+ // 创建区域对象
+ List<Region> list = new ArrayList<>();
+ if (!Strings.isBlank(roleName) && roleName.equals("wgy")){
+ // 查询综治区域集合
+ 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);
+ list.addAll(regionChildList);
}
// 返回
return list;
@@ -284,6 +316,10 @@
//递归遍历下一级
treeRegionList(regionList,region.getCode(),list);
}
+ if(region.getCode().equals(parentCode)){
+ // 本身也加入
+ list.add(region);
+ }
}
return list;
}
--
Gitblit v1.9.3