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/district/mapper/DistrictMapper.xml |    5 ++++-
 1 files changed, 4 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 bb36abc..a7017f2 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -39,6 +39,9 @@
         <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>
 
     <!--小区树查询-->
@@ -51,7 +54,7 @@
         union all
         (
         select
-        aoi_code as id,
+        id,
         community_code as parentId,
         name
         from jczz_district

--
Gitblit v1.9.3