From f6760448428b0a11aebab4ee281023532e4f61d7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 19:53:56 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
index 7d28d3d..49ce130 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
@@ -82,16 +82,17 @@
<select id="getBorrowDetailByApplicationCode"
resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO"
parameterType="java.lang.Long">
- SELECT
+ SELECT DISTINCT
oaa.*,
oaaa.title,
oaaa.asset_type_id,
oaaa.operate_time
FROM
oa_approval_applications oaa
- LEFT JOIN oa_approval_application_asset oaaa ON oaa.id = oaaa.approval_application_id
+ LEFT JOIN oa_approval_application_asset oaaa ON oaa.id = oaaa.approval_application_id AND oaaa.return_status != 2
LEFT JOIN oa_approval_application_asset borrow_oaaa ON borrow_oaaa.borrow_application_id = oaa.id
AND borrow_oaaa.return_status != 2
+
WHERE
oaa.applicant_user_id = #{userId}
AND oaa.approval_status = '${@com.ruoyi.system.emums.ApprovalStatusEnum@PASSED.getCode()}'
--
Gitblit v1.7.1