From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/RegionMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 2afc454..fa593e0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
@@ -64,8 +64,25 @@
 	/**
 	 * 树列表
 	 * @param parentCode
+	 * @param regionCode
 	 * @return
 	 */
 	@MapKey(value = "id")
-    Map<String, TreeStringNode> getTreeList(@Param("parentCode") String parentCode);
+    Map<String, TreeStringNode> getTreeList(@Param("parentCode") String parentCode,
+											@Param("regionCode") String regionCode);
+
+	/**
+	 * 树列表(获取当前树)
+	 * @param regionCode
+	 * @return
+	 */
+	@MapKey(value = "id")
+	Map<String, TreeStringNode> getTownTree(@Param("regionCode") String regionCode);
+
+	/**
+	 * 树列表(包含省市县三级)
+	 * @return
+	 */
+	@MapKey(value = "id")
+    Map<String, TreeStringNode> getBaseTree();
 }

--
Gitblit v1.9.3