From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 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 88746ce..e25a897 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -35,8 +35,11 @@
<select id="selectTaskLabelReportingEventPage" resultMap="taskLabelReportingEventResultMap">
select * from jczz_task_label_reporting_event where is_deleted = 0
- <if test="vo.userId != null and vo.userId != ''">
- AND user_id = #{vo.checkUserId}
+ <if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
+ AND user_id = #{taskLabelReportingEvent.userId}
+ </if>
+ <if test="taskLabelReportingEvent.eventType != null and taskLabelReportingEvent.eventType != ''">
+ AND event_type = #{taskLabelReportingEvent.eventType}
</if>
</select>
--
Gitblit v1.9.3