From 0d82e9bb89c8569847537f1ce8b9d994bbc4099b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 九月 2025 19:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetItemMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetItemMapper.xml
index 36dddfb..61e8401 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetItemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAssetItemMapper.xml
@@ -32,7 +32,7 @@
left join asset_main t2 on t2.id = t1.asset_main_id
left join asset_type t3 on t3.id = t2.asset_type_id
left join t_dept t4 on t4.id = t2.ownership_dept_id
- left join oa_approval_application_storage t5 on t5.approval_application_id = t1.approval_application_id
+ left join oa_approval_application_storage t5 on t5.approval_application_id = t2.approval_application_id
left join t_dept t6 on t6.id = t2.use_dept_id
where t1.approval_application_id = #{query.approvalApplicationId}
order by t1.id desc
--
Gitblit v1.7.1