From 325c6107782d4a2284bb24be688e7a87462dc202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 28 九月 2025 14:48:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
index 5ba1805..2da4995 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
@@ -60,6 +60,8 @@
left join t_dept t3 on t3.id = t1.use_dept_id
left join t_dept t4 on t4.id = t1.ownership_dept_id
where t1.approval_application_id = #{query.id}
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+
order by t1.create_time desc
--
Gitblit v1.7.1