From b822ea020a6d4edec0d183af32532076cdca062c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 09 May 2024 20:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index 57dd84f..51bc0ad 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -58,6 +58,11 @@
<if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
AND jtlre.user_id = #{taskLabelReportingEvent.userId}
</if>
+
+ <if test="taskLabelReportingEvent.houseCode != null and taskLabelReportingEvent.houseCode != ''">
+ and jp.house_code = #{taskLabelReportingEvent.houseCode}
+ </if>
+
<if test="taskLabelReportingEvent.eventType != null and taskLabelReportingEvent.eventType != ''">
AND jtlre.event_type = #{taskLabelReportingEvent.eventType}
</if>
--
Gitblit v1.9.3