From 325eae7955d25e716684a3ae15e9aeed7951259a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 21 三月 2025 11:04:04 +0800
Subject: [PATCH] 驳回删除日志、总体流程日志查询调整

---
 flowable/src/main/resources/mapper/ProcessLogMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/flowable/src/main/resources/mapper/ProcessLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
index 8b788c5..c638af4 100644
--- a/flowable/src/main/resources/mapper/ProcessLogMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
@@ -72,11 +72,13 @@
             t_process_log TFL
                 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.process_ins_id = #{query.processInsId}
+        <where>
+            <if test="query.deleted != null">TFL.deleted = #{query.deleted}</if>
+            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>
+        </where>
         ORDER BY
             TFL.gmt_create DESC
     </select>

--
Gitblit v1.8.0