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 | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 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 57d4cb4..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,11 +47,11 @@
FROM
jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
- LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code
- LEFT JOIN blade_user bu on bu.id = jt.create_user
+ 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
- LEFT JOIN jczz_community jc on jc.`code`= jg.community_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
<where>
<if test="task.userId != null and task.userId != ''">
AND jt.house_code IN (
@@ -63,8 +63,18 @@
LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
WHERE
jg.is_deleted = 0
- <if test="task.communityCode != null and task.communityCode != ''">
- and jg.community_code = #{task.communityCode}
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
AND jgm.user_id = #{task.userId} )
</if>
@@ -129,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
@@ -163,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 != ''">
@@ -203,10 +213,23 @@
</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 = #{task.userId}
+ AND jc.res_police_user_id like concat('%',#{task.userId},'%')
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jc.code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jc.code in ('')
+ </otherwise>
+ </choose>
</if>
</where>
</select>
@@ -238,12 +261,12 @@
FROM
jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
- LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code
- LEFT JOIN blade_user bu on bu.id = jt.create_user
+ 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
- LEFT JOIN jczz_community jc on jc.`code`= jg.community_code
- LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
+ LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id and jtbre.is_deleted = 0
<where>
<if test="task.userId != null and task.userId != ''">
AND jt.house_code IN (
--
Gitblit v1.9.3