From 853c8ba11072eae475273864e61733ae7294f004 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalTodoMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalTodoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalTodoMapper.xml
index 6bb5c05..ac3a097 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalTodoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalTodoMapper.xml
@@ -22,14 +22,24 @@
id, application_id, application_code, flow_node_id, user_id, user_name, dept_id, sort_order, status, create_time, handle_time
</sql>
<select id="pageList" resultType="com.ruoyi.system.model.OaApprovalTodo">
- select * from oa_approval_todo
- where 1=1
+ SELECT *
+ FROM oa_approval_todo t1
+ WHERE t1.id = (
+ SELECT t2.id
+ FROM oa_approval_todo t2
+ WHERE t2.application_id = t1.application_id
+ AND t2.status = 0
<if test="query.userId != null">
- and user_id = #{query.userId}
+ AND t2.user_id = #{query.userId}
</if>
- and status = 0
- group by application_id
- order by create_time desc
+ ORDER BY t2.create_time DESC
+ LIMIT 1
+ )
+ <if test="query.userId != null">
+ AND t1.user_id = #{query.userId}
+ </if>
+ AND t1.status = 0
+ ORDER BY t1.create_time DESC
</select>
<select id="pageListAudit" resultType="com.ruoyi.system.model.OaApprovalTodo">
select * from oa_approval_todo
--
Gitblit v1.7.1