From 687f224f099d08f9d7a5d908570d28e5d8b7e7c6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 17 Jan 2024 19:01:08 +0800
Subject: [PATCH] 物业评分+bug修复
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 1714b98..c022f78 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,13 @@
AND jtrfr.phone like concat('%',#{vo.phone},'%')
</if>
<if test="vo.confirmFlag != null">
- AND jtrfr.confirm_flag = #{vo.confirmFlag}
+ AND (jtrfr.confirm_flag = #{vo.confirmFlag}
+ <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
+ or jtrfr.confirm_user_id = #{vo.confirmUserId}
+ </if>
+ )
</if>
- <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
- AND jtrfr.confirm_user_id = #{vo.confirmUserId}
- </if>
+
<if test="vo.status != null">
AND jtrfr.status = #{vo.status}
</if>
@@ -264,6 +266,10 @@
WHERE is_deleted = 0
<if test="userId != null">
and create_user = #{userId}
+
+ </if>
+ <if test="houseCode != null and houseCode != ''">
+ and address_code = #{houseCode}
</if>
</select>
--
Gitblit v1.9.3