From e8b6c448f8af84d78a90ab768af824b32bc3135b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 10 Apr 2024 21:25:24 +0800
Subject: [PATCH] 新增角色及网格员首页社区数据过滤

---
 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 0867a16..c2c59b1 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
@@ -244,7 +244,7 @@
 			list.addAll(policeList);
 		}
 		// 查询综治区域集合
-		List<Region> regionChildList = baseMapper.getRegionChildList(regionCode);
+		List<Region> regionChildList = baseMapper.getRegionChildList(regionCode,null,null);
 		list.addAll(regionChildList);
 		//  返回
 		return list;
@@ -270,6 +270,28 @@
 	}
 
 	/**
+	 * 获取综治下级区域
+	 * @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 {
+			// 查询综治区域集合
+			List<Region> regionChildList = baseMapper.getRegionChildList(regionCode, communityCode, roleName);
+			list.addAll(regionChildList);
+		}
+		//  返回
+		return list;
+	}
+
+	/**
 	 * 获取某个父节点下面的所有子节点
 	 * @param regionList
 	 * @param parentCode

--
Gitblit v1.9.3