From 17c7e460e0664ef30b34b6a6af8ad72a075d401c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 24 三月 2025 15:05:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml b/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml
index 45e16f2..e793981 100644
--- a/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml
+++ b/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml
@@ -24,9 +24,12 @@
<select id="pageManageDocumentCancel" resultMap="BaseResultMap">
select * from (select mdc.*,
- u.name createUserName
+ u1.name createUserName,
+ u2.name checkUserName
from cnas_manage_document_cancel mdc
- left join user u on mdc.create_user = u.id)A
+ left join user u1 on mdc.create_user = u1.id
+ left join user u2 on mdc.check_user = u2.id
+ )A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3