From 1f869d1e5c9361645e7be28d2c27407d838a7d22 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Jan 2024 11:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 6 +-----
1 files changed, 1 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 c022f78..028f6b4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -172,11 +172,7 @@
AND jtrfr.phone like concat('%',#{vo.phone},'%')
</if>
<if test="vo.confirmFlag != null">
- AND (jtrfr.confirm_flag = #{vo.confirmFlag}
- <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
- or jtrfr.confirm_user_id = #{vo.confirmUserId}
- </if>
- )
+ AND jtrfr.confirm_flag = #{vo.confirmFlag}
</if>
<if test="vo.status != null">
--
Gitblit v1.9.3