From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
index 0dac4af..31ea207 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
@@ -42,6 +42,9 @@
<where>
AND aaa.disabled = 0
AND oaa.type = #{query.type}
+ <if test="query.returnNotify == 1">
+ AND oaa.return_status != 2
+ </if>
<if test="query != null and query.keyword != null and query.keyword != ''">
AND (
oaa.title LIKE CONCAT('%', #{query.keyword}, '%')
@@ -51,7 +54,7 @@
)
</if>
<if test="query != null and query.deptId != null">
- AND aaa.dept_id = #{query.deptId}
+ AND (td.id = #{query.deptId} OR FIND_IN_SET(#{query.deptId}, td.parent_id))
</if>
</where>
ORDER BY oaa.operate_time DESC, oaa.id DESC
@@ -71,7 +74,7 @@
LEFT JOIN oa_approval_application_asset oaaa ON oaaai.approval_application_id = oaaa.approval_application_id
LEFT JOIN oa_approval_applications oaa ON oaaai.approval_application_id = oaa.id
<where>
- oaaa.type = 2 AND oaaa.borrow_application_id = #{applicationId}
+ oaaa.type = 2 AND oaaa.borrow_application_id = #{applicationId} AND oaa.approval_status = 1
<if test="assetMainIds != null and assetMainIds.size() > 0">
AND oaaai.asset_main_id IN
<foreach collection="assetMainIds" item="id" open="(" separator="," close=")">
@@ -86,14 +89,20 @@
parameterType="java.lang.Long">
SELECT
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 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 = 1
+ AND oaa.approval_status = '${@com.ruoyi.system.emums.ApprovalStatusEnum@PASSED.getCode()}'
AND oaaa.type = 1
+ AND oaa.approval_id = '${@com.ruoyi.system.emums.ApprovalTypeEnum@BORROW.getCode()}'
+
</select>
</mapper>
--
Gitblit v1.7.1