From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 41727fe..ab0c9fc 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -232,7 +232,7 @@
or jtrfr.confirm_user_id = #{vo.confirmUserId}
</if>
</if>
- <!-- 网格员及其他 -->
+ <!-- 其他 -->
<if test="vo.roleType ==null">
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
@@ -249,7 +249,9 @@
)
</when>
</choose>
-
+ </if>
+ <!-- 网格员 -->
+ <if test="vo.roleName =='wgy'">
<choose>
<when test="gridCodeList !=null and gridCodeList.size()>0">
and (
@@ -257,7 +259,7 @@
<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
- or
+ or
jp.grid_code in
<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
#{code}
@@ -272,7 +274,6 @@
<if test="vo.confirmUserId != null ">
or jtrfr.confirm_user_id = #{vo.confirmUserId}
</if>
-
</if>
</if>
ORDER BY jtrfr.create_time DESC
@@ -350,7 +351,8 @@
<where>
and jtr.is_deleted = 0
and jtr.confirm_flag = 1
- <if test="userId != null">
+
+ <if test="userId != null and roleName == 'wgy'" >
AND (
jp.grid_code IN (
SELECT
@@ -373,6 +375,28 @@
AND jgm.user_id = #{userId}
))
</if>
+
+ <if test="userId != null and roleName == 'mj'">
+ AND (
+ jp.jw_grid_code IN (
+ SELECT
+ jpag.jw_grid_code
+ FROM
+ jczz_police_affairs_grid jpag
+ WHERE
+ jpag.is_deleted = 0
+ AND jpag.police_user_id = #{userId}
+ )
+ OR jh.jw_grid_code IN (
+ SELECT
+ jpag.jw_grid_code
+ FROM
+ jczz_police_affairs_grid jpag
+ WHERE
+ jpag.is_deleted = 0
+ AND jpag.police_user_id = #{userId}
+ ))
+ </if>
</where>
</select>
--
Gitblit v1.9.3