From ad0bc4e763fa988a2ec4dd8dfab7381ea7726021 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 17:46:48 +0800
Subject: [PATCH] 区划树查询修改

---
 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 fd473e7..d418cbb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -104,16 +104,27 @@
 
     <!--根据父编号查询所有的下级-->
     <select id="getTreeList" resultType="org.springblade.common.node.TreeStringNode">
+        <if test="region.cityCode!=null and region.cityCode!=''">
+            SELECT
+            code as id,
+            parent_code as parentId,
+            name
+            FROM blade_region
+            where code = #{region.cityCode}
+            union all
+        </if>
         SELECT
         code as id,
         parent_code as parentId,
         name
-        FROM blade_region where district_code = '361102'
-        <if test="parentCode!=null">
-            and parent_code = #{parentCode}
+        FROM blade_region
+        where 1=1
+        and district_code = '361102'
+        <if test="region.parentCode!=null and region.parentCode!=''">
+            and parent_code = #{region.parentCode}
         </if>
-        <if test="regionCode!=null and regionCode!=''">
-            and code like concat('%',#{regionCode},'%')
+        <if test="region.regionCode!=null and region.regionCode!=''">
+            and code like concat('%',#{region.regionCode},'%')
         </if>
     </select>
 

--
Gitblit v1.9.3