From fee8fbb72f73cc11075b07bf457ce2dd2a9ce19e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 05 Jul 2024 11:15:47 +0800
Subject: [PATCH] 无诈代码优化

---
 src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index 51bc0ad..1e83fa4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -55,6 +55,14 @@
         LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         LEFT JOIN blade_region br on br.code = jpag.community_code
         where jtlre.is_deleted = 0
+        <if test="taskLabelReportingEvent.streetName != null and taskLabelReportingEvent.streetName != ''">
+            AND br.town_name like concat('%',#{taskLabelReportingEvent.streetName},'%')
+        </if>
+
+        <if test="taskLabelReportingEvent.communityName != null and taskLabelReportingEvent.communityName != ''">
+            AND br.village_name like concat('%',#{taskLabelReportingEvent.communityName},'%')
+        </if>
+
         <if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
             AND jtlre.user_id = #{taskLabelReportingEvent.userId}
         </if>
@@ -124,7 +132,7 @@
                 <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                     and
                     (
-                    jg.grid_code in
+                    jg.community_code in
                     <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                         #{code}
                     </foreach>

--
Gitblit v1.9.3