From 2dad58eb94e729b2efd51ebac7fcc773aca80ded Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 03 Apr 2024 14:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..0867a16 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()){
// 公安
@@ -234,11 +234,11 @@
* @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);
@@ -256,11 +256,11 @@
* @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);
--
Gitblit v1.9.3