From 99d1df166bc42edf778ff9e6d72d60f81638ac6c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 19 Apr 2024 08:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.java | 18 +++++++++++++++++-
1 files changed, 17 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..03d1f88 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,18 @@
* @return
*/
List<Region> getPoliceList(@Param("communityCode") String communityCode);
+
+ /**
+ * 查询网格员对应的网格
+ * @param regionCode
+ * @return
+ */
+ List<Region> getGridRegionChildList(@Param("regionCode") String regionCode);
+
+ /**
+ * 查询当前文章范围对应的社区编号字符串集合
+ * @param articleRange
+ * @return
+ */
+ List<String> getAllCommunityNameListString(@Param("articleRange") String articleRange);
}
--
Gitblit v1.9.3