From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据,不设置网格信息

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 8b59b45..768ae89 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -47,7 +47,7 @@
         FROM
         jczz_task jt
         LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
-        LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code>0 and jp.is_deleted = 0
+        LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code)>0 and jp.is_deleted = 0
         LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
         LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
         LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
@@ -139,10 +139,10 @@
             </if>
             <!-- 场所店铺 -->
             <if test="task.reportType != null and task.reportType == 2 ">
-                and jt.report_type in (2,3,4,5,6)
+                and jt.report_type in (2,3,4,5,6,7)
             </if>
             <if test="task.reportType == null">
-                and jt.report_type in (2,3,4,5,6)
+                and jt.report_type in (2,3,4,5,6,7)
             </if>
             and jt.is_deleted = 0
             and jt.house_code is not null
@@ -173,7 +173,7 @@
             </if>
             <!-- 场所店铺 -->
             <if test="reportType != null and reportType == 2 ">
-                and jt.report_type in (2,3,4,5,6)
+                and jt.report_type in (2,3,4,5,6,7)
             </if>
 
             <if test="name != null and name != ''">
@@ -213,7 +213,7 @@
             </if>
 
             <if test="task.reportType == null or task.reportType == ''">
-                AND jt.report_type in (2,3,6)
+                AND jt.report_type in (2,3,6,7)
             </if>
             <if test="task.userId != null and task.userId != ''">
                 AND jc.res_police_user_id like concat('%',#{task.userId},'%')
@@ -261,7 +261,7 @@
         FROM
         jczz_task jt
         LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
-        LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code>0 and jp.is_deleted = 0
+        LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code)>0 and jp.is_deleted = 0
         LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
         LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
         LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0

--
Gitblit v1.9.3