From 5d00461c75205fb306ead59522350fa1e8a3e729 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:35:27 +0800
Subject: [PATCH] Merge branch 'dev'
---
flowable/src/main/resources/mapper/ProcessLogMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/flowable/src/main/resources/mapper/ProcessLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
index 1c6c529..8b788c5 100644
--- a/flowable/src/main/resources/mapper/ProcessLogMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
@@ -73,7 +73,10 @@
LEFT JOIN sys_user SU ON SU.user_id = TFL.user_id
LEFT JOIN sys_dept SD ON SU.dept_id = SD.dept_id
WHERE
- TFL.deleted = 0 AND TFL.project_id = #{query.projectId} AND TFL.process_ins_id = #{query.processInsId}
+ TFL.deleted = 0 AND TFL.process_ins_id = #{query.processInsId}
+ <if test="query.taskId != null and query.taskId != ''">AND TFL.task_id = #{query.taskId}</if>
+ <if test="query.projectId != null and query.projectId != ''">AND TFL.project_id = #{query.projectId}</if>
+ <if test="query.taskDefKey != null and query.taskDefKey != ''">AND TFL.task_def_key = #{query.taskDefKey}</if>
ORDER BY
TFL.gmt_create DESC
</select>
--
Gitblit v1.8.0