From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IRegionService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IRegionService.java b/src/main/java/org/springblade/modules/system/service/IRegionService.java
index 953b27b..784fac0 100644
--- a/src/main/java/org/springblade/modules/system/service/IRegionService.java
+++ b/src/main/java/org/springblade/modules/system/service/IRegionService.java
@@ -22,6 +22,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;
@@ -87,10 +88,10 @@
 
 	/**
 	 * 树列表
-	 * @param parentCode
+	 * @param region
 	 * @return
 	 */
-	List<TreeStringNode> getTree(String parentCode);
+	List<TreeStringNode> getTree(RegionParamVO region);
 
 	/**
 	 * 树列表(获取当前树）
@@ -98,4 +99,29 @@
 	 * @return
 	 */
 	List<TreeStringNode> getTownTree(String code);
+
+	/**
+	 * 树列表(包含省市县三级)
+	 * @return
+	 */
+	List<TreeStringNode> getBaseTree();
+
+	/**
+	 * 区划数据处理
+	 */
+    void regionDataHandle();
+
+	/**
+	 * 查询下级区域
+	 * @param regionCode
+	 * @return
+	 */
+	List<Region> getRegionChild(String regionCode);
+
+	/**
+	 * 获取民警下级区域
+	 * @param regionCode
+	 * @return
+	 */
+	List<Region> getPoliceRegionChild(String regionCode);
 }

--
Gitblit v1.9.3