From 3de2d31db9ac65c354fd228ab84fa2ed786482b9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 29 九月 2025 11:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml | 4 ++--
1 files changed, 2 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 93a0186..0dac4af 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetMapper.xml
@@ -72,9 +72,9 @@
LEFT JOIN oa_approval_applications oaa ON oaaai.approval_application_id = oaa.id
<where>
oaaa.type = 2 AND oaaa.borrow_application_id = #{applicationId}
- <if test="assetIds != null and assetIds.size() > 0">
+ <if test="assetMainIds != null and assetMainIds.size() > 0">
AND oaaai.asset_main_id IN
- <foreach collection="assetIds" item="id" open="(" separator="," close=")">
+ <foreach collection="assetMainIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
--
Gitblit v1.7.1