From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
index be9dd4f..94db2a5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
@@ -21,6 +21,7 @@
<select id="selectApplicationStoragePage" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO">
SELECT
oas.id AS id,
+ oas.asset_type_id AS assetTypeId,
aaa.dept_name AS deptName,
aaa.application_code AS applicationCode,
oas.title AS title,
@@ -56,9 +57,9 @@
end as useName
- from asset_main t1
- left join asset_type t2 on t3.id = t1.asset_type_id
- left join t_dept t3 on t4.id = t3.ownership_dept_id
+ from oa_approval_application_storage_asset t1
+ left join asset_type t2 on t2.id = t1.asset_type_id
+ left join t_dept t3 on t3.id = t1.ownership_dept_id
where t1.approval_application_id = #{query.approvalApplicationId}
order by t1.create_time desc
--
Gitblit v1.7.1