From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 1da8e49..dcbbfd7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
@@ -23,6 +23,7 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
+import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;
import java.util.List;
@@ -67,7 +68,9 @@
* @return
*/
@MapKey(value = "id")
- Map<String, TreeStringNode> getTreeList(@Param("region") RegionVO region);
+ Map<String, TreeStringNode> getTreeList(@Param("region") RegionParamVO region,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 树列表(获取当前树）
@@ -89,4 +92,24 @@
* @return
*/
List<Region> getCodeLess12DataList();
+
+ /**
+ * 查询下级区域(拼接网格)
+ * @param regionCode
+ * @return
+ */
+ List<Region> getRegionChildList(@Param("regionCode") String regionCode);
+
+ /**
+ * 查询公安对应的辖区树
+ * @return
+ */
+ @MapKey(value = "id")
+ Map<String, TreeStringNode> getPoliceTreeList();
+
+ /**
+ * 查询公安相关的区域数据
+ * @return
+ */
+ List<Region> getPoliceList();
}
--
Gitblit v1.9.3