From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 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 112c74e..f6882cc 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -174,9 +174,15 @@
<if test="vo.confirmFlag != null">
AND jtrfr.confirm_flag = #{vo.confirmFlag}
</if>
+ <if test="vo.confirmUserId != null">
+ AND jtrfr.confirm_user_id = #{vo.confirmUserId}
+ </if>
<if test="vo.status != null">
AND jtrfr.status = #{vo.status}
</if>
+ <if test="vo.addressCode != null">
+ AND jtrfr.address_code = #{vo.addressCode}
+ </if>
<if test="vo.viewType != null">
AND jtrfr.view_type = #{vo.viewType}
</if>
--
Gitblit v1.9.3