From 836539b11e4871784db19058110b28b90c7c006e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 九月 2025 11:55:31 +0800
Subject: [PATCH] 审批代码提交
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
index 1332ce7..5ba1805 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
@@ -48,19 +48,18 @@
ORDER BY oas.storage_time DESC, oas.id DESC
</select>
<select id="pageList" resultType="com.ruoyi.system.vo.StorageListVO">
- select t1.*,t2.type_name as assetTypeName,
+ select t1.*,t2.type_name as assetTypeName,t4.dept_name as ownershipDeptName,
case
when t1.use_dept_id is not null and t1.use_dept_id != '' then t3.dept_name
when t1.address is not null and t1.address != '' then t1.address
when t1.warehouse_name is not null and t1.warehouse_name != '' then t1.warehouse_name
else null
end as useName
-
-
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}
+ left join t_dept t3 on t3.id = t1.use_dept_id
+ left join t_dept t4 on t4.id = t1.ownership_dept_id
+ where t1.approval_application_id = #{query.id}
order by t1.create_time desc
--
Gitblit v1.7.1