From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 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 3493418..0830adb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -232,7 +232,7 @@
SELECT
code,parent_code,name,ancestors,region_level,sort
FROM blade_region
- where ancestors like concat('%',#{regionCode},'%')
+ where (ancestors like concat('%',#{regionCode},'%') or code = #{regionCode})
union all
(
SELECT
@@ -244,27 +244,13 @@
jg.sort
FROM blade_region br
right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
- where br.ancestors like concat('%',#{regionCode},'%')
+ where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode})
)
- union all
- (
- SELECT
- t1.id,t1.parentId,t1.name
- FROM
- (
- SELECT
- @ids AS ids,
- ( SELECT @ids := GROUP_CONCAT( id ) FROM police_region WHERE FIND_IN_SET( parentId, @ids ) ) AS cids
- FROM
- police_region
- WHERE
- @ids IS NOT NULL
- AND @ids := #{regionCode}
- ) id,
- police_region t1
- WHERE
- FIND_IN_SET(t1.parentId,ids)
- )
+ </select>
+
+ <!--查询公安相关的区域数据-->
+ <select id="getPoliceList" resultType="org.springblade.modules.system.entity.Region">
+ SELECT id as code,parentId as parent_code,name,'' as ancestors,null as region_level,1 as sort FROM police_region
</select>
--
Gitblit v1.9.3