From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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 f7c96a2..1b9701e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -105,21 +105,39 @@
<!--根据父编号查询所有的下级-->
<select id="getTreeList" resultType="org.springblade.common.node.TreeStringNode">
SELECT
- br.code as id,br.parent_code as parentId,br.name as name
- FROM
- (
- SELECT
- @ids AS ids,
- ( SELECT @ids := GROUP_CONCAT( code ) FROM blade_region WHERE FIND_IN_SET( parent_code, @ids ) ) AS cids
- FROM
- blade_region
- WHERE
- @ids IS NOT NULL
- AND @ids := #{parentCode}
- ) id,
- blade_region br
- WHERE
- FIND_IN_SET(br.parent_code,ids)
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ <if test="parentCode!=null">
+ and parent_code = #{parentCode}
+ </if>
+ <if test="regionCode!=null and regionCode!=''">
+ and code like concat('%',#{regionCode},'%')
+ </if>
+ </select>
+
+ <!--根据当前编号查询-->
+ <select id="getTownTree" resultType="org.springblade.common.node.TreeStringNode">
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ and region_level = 4
+ <if test="regionCode!=null and regionCode!=''">
+ and code = #{regionCode}
+ </if>
+ union
+ SELECT
+ code as id,
+ parent_code as parentId,
+ name
+ FROM blade_region where district_code = '361102'
+ and region_level = 4
+ <if test="regionCode!=null and regionCode!=''">
+ and parent_code = #{regionCode}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3