From 6a4decabbf8eb20f4444fd1933461d81b2071876 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 01 六月 2026 10:26:10 +0800
Subject: [PATCH] fix:(用印管理)调整
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 1 +
src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java | 2 +-
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml | 8 +++++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index bcfc20d..18a6f4e 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
@AllArgsConstructor
@RestController
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
index 8dc8454..9abf3b9 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
@@ -9,6 +9,6 @@
//鎵�灞為儴闂�
private String department;
- //瀹℃壒浜�
+ //瀹℃壒浜哄鍚�
private String approveUserName;
}
diff --git a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
index 5da6dff..8bb16b5 100644
--- a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -4,13 +4,14 @@
<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,
+ (select d.dept_name from sys_user_dept sud
+ inner join sys_dept d on sud.dept_id = d.dept_id
+ where sud.user_id = su.user_id limit 1) 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},'%')
@@ -22,5 +23,6 @@
and sam.status = #{ew.status}
</if>
</where>
+ order by sam.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3