From 016e47ea961d84a186db0bbd45cd6d7eaaa57bc3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jan 2024 16:30:20 +0800
Subject: [PATCH] 文章添加小区id 字段
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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..0f0be63 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>
@@ -206,7 +216,20 @@
AND jt.report_type in (2,3,6)
</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