From 5e014678ad6e5cf2be0bf40b08295518c67dcff8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 09:27:23 +0800
Subject: [PATCH] e呼即办街道社区数据过滤

---
 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 a08c6f3..cddcfbf 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -30,8 +30,17 @@
         <if test="district.name !=null and district.name !=''">
             and jd.name like concat('%',#{district.name},'%')
         </if>
+        <if test="district.communityName !=null and district.communityName !=''">
+            and br.village_name like concat('%', #{district.communityName},'%')
+        </if>
         <if test="district.communityCode !=null and district.communityCode !=''">
             and jd.community_code = #{district.communityCode}
+        </if>
+        <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>
     </select>
 
@@ -45,11 +54,17 @@
         union all
         (
         select
-        id,
+        aoi_code as id,
         community_code as parentId,
         name
         from jczz_district
         where is_deleted = 0
+        <if test="district.districtIdList!=null and district.districtIdList!=''">
+            and id in
+            <foreach collection="district.districtIdList" item="item" separator ="," open="("  close=")">
+                #{item}
+            </foreach>
+        </if>
         )
     </select>
 

--
Gitblit v1.9.3