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/OaApprovalApplicationChangeMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml
index ff77153..e423268 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationChangeMapper.xml
@@ -25,7 +25,7 @@
SELECT
app.id,
app.application_code AS applicationCode,
- change.title,
+ oaac.title,
d.dept_name AS deptName,
u.nick_name AS applicantName,
app.application_reason AS applicationReason,
@@ -39,13 +39,13 @@
ELSE '未知'
END AS approvalStatusName
FROM oa_approval_applications app
- INNER JOIN oa_approval_application_change change ON app.id = change.approval_application_id
+ INNER JOIN oa_approval_application_change oaac ON app.id = oaac.approval_application_id
LEFT JOIN sys_user u ON app.applicant_user_id = u.user_id
LEFT JOIN t_dept d ON app.dept_id = d.id
WHERE app.disabled = 0
- AND app.approval_id = 4 <!-- 资产变更审批类型 -->
+ AND app.approval_id = '${@com.ruoyi.system.emums.ApprovalTypeEnum@ASSET_CHANGE.getCode()}'
<if test="query.keyword != null and query.keyword != ''">
- AND (change.title LIKE CONCAT('%', #{query.keyword}, '%')
+ AND (oaac.title LIKE CONCAT('%', #{query.keyword}, '%')
OR app.application_code LIKE CONCAT('%', #{query.keyword}, '%'))
</if>
<if test="query.deptId != null">
--
Gitblit v1.7.1