From 52c95b4ca6e53ff53e43d80b58cc19b715e4533d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 17:56:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index ebabc2d..baeeace 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -39,8 +39,18 @@
<if test="district.townStreetName !=null and district.townStreetName !=''">
and br.town_name like concat('%',#{district.townStreetName},'%')
</if>
- <if test="district.regionCode !=null and district.regionCode !=''">
- and jd.community_code like concat('%',#{district.regionCode},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jd.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jd.community_code in ('')
+ </otherwise>
+ </choose>
</if>
</select>
@@ -51,7 +61,7 @@
parent_code as parentId,
name,
remark aoiCode
- FROM blade_region where district_code = '361102'
+ FROM blade_region where district_code = '361102000000'
union all
(
select
--
Gitblit v1.9.3