From 50ee6ccb8d8036ffaa2aabb4e4999c14a05b45a3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 九月 2025 16:35:12 +0800
Subject: [PATCH] 资产管理数据权限修改

---
 ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
index 2da4995..695809a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml
@@ -20,30 +20,34 @@
     <!-- 分页查询:资产入库申请列表(关联审批记录与资产类型) -->
     <select id="selectApplicationStoragePage" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO">
         SELECT
-            aaa.id                               AS id,
-            oas.asset_type_id                    AS assetTypeId,
-            aaa.dept_name                        AS deptName,
-            aaa.application_code                 AS applicationCode,
-            oas.title                            AS title,
-            CASE WHEN at2.level = 2 THEN at1.type_name ELSE at2.type_name END AS firstAssetTypeName,
-            CASE WHEN at2.level = 2 THEN at2.type_name ELSE NULL END         AS secondAssetTypeName,
-            aaa.applicant_name                   AS applicantName,
-            oas.storage_time                     AS storageTime,
-            oas.storage_type                     AS storageType,
-            aaa.approval_status                  AS approvalStatus
+        aaa.id,
+        oas.asset_type_id,
+        aaa.dept_name,
+        aaa.application_code,
+        oas.title,
+        CASE WHEN at2.level = 2 THEN at1.type_name ELSE at2.type_name END AS firstAssetTypeName,
+        CASE WHEN at2.level = 2 THEN at2.type_name ELSE NULL END AS secondAssetTypeName,
+        aaa.applicant_name,
+        oas.storage_time,
+        oas.storage_type,
+        aaa.approval_status
         FROM oa_approval_application_storage oas
-                 INNER JOIN oa_approval_applications aaa ON aaa.id = oas.approval_application_id
-                 LEFT JOIN asset_type at2 ON at2.id = oas.asset_type_id
-                 LEFT JOIN asset_type at1 ON at1.id = (CASE WHEN at2.level = 2 THEN at2.parent_id ELSE at2.id END)
+        INNER JOIN oa_approval_applications aaa ON aaa.id = oas.approval_application_id
+        LEFT JOIN asset_type at2 ON at2.id = oas.asset_type_id
+        LEFT JOIN asset_type at1 ON at1.id = (CASE WHEN at2.level = 2 THEN at2.parent_id ELSE at2.id END)
+        LEFT JOIN t_dept d ON aaa.dept_id = d.id
         <where>
             AND aaa.disabled = 0
             <if test="query != null and query.keyword != null and query.keyword != ''">
                 AND (
                 oas.title LIKE CONCAT('%', #{query.keyword}, '%')
-                OR  aaa.application_code LIKE CONCAT('%', #{query.keyword}, '%')
-                OR  aaa.dept_name LIKE CONCAT('%', #{query.keyword}, '%')
+                OR aaa.application_code LIKE CONCAT('%', #{query.keyword}, '%')
+                OR aaa.dept_name LIKE CONCAT('%', #{query.keyword}, '%')
                 )
             </if>
+            <if test="query.deptId != null">
+                AND (d.id = #{query.deptId} OR FIND_IN_SET(#{query.deptId}, d.parent_id))
+            </if>
         </where>
         ORDER BY oas.storage_time DESC, oas.id DESC
     </select>

--
Gitblit v1.7.1