From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 a2d8738..ebabc2d 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>
 
@@ -40,14 +49,16 @@
         SELECT
         code as id,
         parent_code as parentId,
-        name
+        name,
+        remark aoiCode
         FROM blade_region where district_code = '361102'
         union all
         (
         select
         id,
         community_code as parentId,
-        name
+        name,
+        aoi_code aoiCode
         from jczz_district
         where is_deleted = 0
         <if test="district.districtIdList!=null and district.districtIdList!=''">

--
Gitblit v1.9.3