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/AssetMainMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
index 5bb2d5c..6927d64 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
@@ -69,6 +69,8 @@
LEFT JOIN asset_type at ON at.id = am.asset_type_id
LEFT JOIN t_dept od ON od.id = am.ownership_dept_id
LEFT JOIN t_dept ud ON ud.id = am.use_dept_id
+ LEFT JOIN oa_approval_application_asset_item oaaai ON oaaai.asset_main_id = am.id
+ LEFT JOIN oa_approval_applications oaa ON oaa.id = oaaai.approval_application_id
<where>
AND IFNULL(am.disabled, 0) = 0
AND IFNULL(aaa.disabled, 0) = 0
@@ -76,6 +78,7 @@
AND IFNULL(am.is_disposed, 0) = 0
AND IFNULL(am.is_in_use, 0) = 0
AND IFNULL(am.is_borrowed, 0) = 0
+ AND ( oaa.id IS NULL OR oaa.approval_status != 0 )
<if test="query != null and query.assetTypeId != null">
AND am.asset_type_id = #{query.assetTypeId}
</if>
--
Gitblit v1.7.1