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 | 7 +++++++
src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java | 3 +++
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 2 ++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java b/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java
index b535e69..c188048 100644
--- a/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java
+++ b/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java
@@ -23,4 +23,7 @@
@Schema(description = "鍑哄簱鎵瑰彿")
private String outboundBatches;
+
+ @Schema(description = "褰撳墠鐢ㄦ埛ID锛堟煡璇㈡椂鑷姩娉ㄥ叆锛岀敤浜庤繃婊ょ敵璇蜂汉鍜屽鏍镐汉锛�")
+ private Long currentUserId;
}
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
index fbfef90..c7a80df 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -97,6 +97,8 @@
@Override
public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
+ // 娉ㄥ叆褰撳墠鐢ㄦ埛ID锛岀敤浜庤繃婊ゅ彧鏌ョ湅鐢宠浜哄拰瀹℃牳浜烘槸鑷繁鐨勬暟鎹�
+ approvalInstanceDto.setCurrentUserId(SecurityUtils.getUserId());
IPage<ApprovalInstanceVo> approvalInstanceVoIPage = approvalInstanceMapper.listPage(page, approvalInstanceDto);
List<ApprovalInstanceVo> records = approvalInstanceVoIPage.getRecords();
diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index f632e74..9e487dd 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -51,6 +51,13 @@
<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.create_time desc
</select>
--
Gitblit v1.9.3