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 | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 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..fd473e7 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,49 @@
<!--根据父编号查询所有的下级-->
<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>
+
+ <!--树列表(包含省市县三级)-->
+ <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 <4
</select>
</mapper>
--
Gitblit v1.9.3