From 1e6e1c296add6c168eaa99a8a3e37a9f34d9a2dd Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 10:20:31 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 12 +++++++-----
1 files changed, 7 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 f6882cc..1714b98 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -174,7 +174,7 @@
<if test="vo.confirmFlag != null">
AND jtrfr.confirm_flag = #{vo.confirmFlag}
</if>
- <if test="vo.confirmUserId != null">
+ <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
AND jtrfr.confirm_user_id = #{vo.confirmUserId}
</if>
<if test="vo.status != null">
@@ -190,19 +190,21 @@
AND jtrfr.create_time BETWEEN #{vo.startTime} and #{vo.endTime}
</if>
<if test="vo.regionCode != null and vo.regionCode !='' ">
- and jg.community_code like concat('%',#{vo.regionCode},'%')
+ and jg.community_code like concat(#{vo.regionCode},'%')
</if>
<if test="vo.roleName!=null and vo.roleName!=''">
<if test="vo.roleName=='网格员'">
<choose>
<when test="list != null and list.size()>0">
- and jda.address_code in
- <foreach collection="list" item="houseCode" separator ="," open="(" close=")">
+ and (jda.address_code in
+ <foreach collection="list" item="houseCode" separator="," open="(" close=")">
#{houseCode}
</foreach>
+ or jtrfr.confirm_user_id = #{vo.confirmUserId})
</when>
<otherwise>
- and jda.address_code in ('')
+ and (jda.address_code in ('')
+ or jtrfr.confirm_user_id = #{vo.confirmUserId})
</otherwise>
</choose>
</if>
--
Gitblit v1.9.3