From bdfb1bfaf5dc5d7318c632fcc6fdf3ffacbd075f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 15 Apr 2024 17:21:29 +0800
Subject: [PATCH] 社区管理员查询轮播图+报事报修查询优化
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 1bfac19..f2df262 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
@@ -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);
}
/**
@@ -330,4 +336,15 @@
}
return list;
}
+
+ /**
+ * 查询当前文章范围对应的社区编号字符串集合
+ * @param articleRange
+ * @return
+ */
+ @Override
+ public String getAllCommunityNameListString(String articleRange) {
+ // 分割后es搜索才有效果,不能用逗号分割
+ return String.join("\\",baseMapper.getAllCommunityNameListString(articleRange));
+ }
}
--
Gitblit v1.9.3