From 41f51aa3910dac6b8da3d21e57ac1130caac994a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 11 Apr 2024 08:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/RegionMapper.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
index 49bc53e..26360ed 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
@@ -98,7 +98,9 @@
 	 * @param regionCode
 	 * @return
 	 */
-    List<Region> getRegionChildList(@Param("regionCode") String regionCode);
+    List<Region> getRegionChildList(@Param("regionCode") String regionCode,
+									@Param("communityCode") String communityCode,
+									@Param("roleName") String roleName);
 
 	/**
 	 * 查询公安对应的辖区树
@@ -112,4 +114,11 @@
 	 * @return
 	 */
 	List<Region> getPoliceList(@Param("communityCode") String communityCode);
+
+	/**
+	 * 查询网格员对应的网格
+	 * @param regionCode
+	 * @return
+	 */
+	List<Region> getGridRegionChildList(@Param("regionCode") String regionCode);
 }

--
Gitblit v1.9.3