From d9ff3817f056ad245a16bd394133a407d6c6b9cf Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
index b8ad6a7..5da6dff 100644
--- a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -4,12 +4,17 @@
<select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
- select sam.*, su.user_name as create_user_name, d.dept_name as department
+ select sam.*, su.user_name as create_user_name, d.dept_name as department,
+ su1.nick_name as approveUserName
from seal_application_management sam
left join sys_user su on sam.create_user = su.user_id
+ left join sys_user su1 on sam.approve_user_id = su1.user_id
left join sys_user_dept sud on su.user_id = sud.user_id
left join sys_dept d on sud.dept_id = d.dept_id
<where>
+ <if test="ew.applicationNum != null and ew.applicationNum != ''">
+ and sam.application_num like concat('%',#{ew.applicationNum},'%')
+ </if>
<if test="ew.title != null and ew.title != ''">
and sam.title like concat('%',#{ew.title},'%')
</if>
@@ -18,4 +23,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3