From bd5d1dae54ea1e42e9e9f0d00f671d95914b105f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 16:54:56 +0800
Subject: [PATCH] Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯pro
---
src/main/resources/mapper/approve/ApprovalInstanceMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index 612f457..9e487dd 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -51,8 +51,15 @@
<if test="ew.applicantName != null and ew.applicantName !=''">
and ai.applicant_name = #{ew.applicantName}
</if>
+ <if test="ew.currentUserId != null">
+ and (ai.applicant_id = #{ew.currentUserId}
+ or exists (select 1 from approval_task at2
+ where at2.instance_id = ai.id
+ and at2.approver_id = #{ew.currentUserId}
+ and at2.deleted = 0))
+ </if>
</where>
- order by ai.id desc
+ order by ai.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3