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.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index 9180812..fd473e7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -113,7 +113,7 @@
             and parent_code = #{parentCode}
         </if>
         <if test="regionCode!=null and regionCode!=''">
-            and parent_code = #{regionCode}
+            and code like concat('%',#{regionCode},'%')
         </if>
     </select>
 
@@ -140,4 +140,14 @@
         </if>
     </select>
 
+    <!--树列表(包含省市县三级)-->
+    <select id="getBaseTree" resultType="org.springblade.common.node.TreeStringNode">
+        SELECT
+        code as id,
+        parent_code as parentId,
+        name
+        FROM blade_region
+        where region_level >0 and region_level &lt;4
+    </select>
+
 </mapper>

--
Gitblit v1.9.3