From d1f0ec1a582c69c52ebfe390b551a608c435a077 Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Fri, 6 Sep 2024 10:13:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20workspace&suer=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=E7=94=A8=E6=88=B7=20userName=20=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/workspace/controller/WorkspaceController.java    | 2 ++
 src/main/resources/db/mapper/sys/SysUserMapper.xml          | 6 +++++-
 src/main/resources/db/mapper/workspace/WorkspaceMapper.xml  | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java b/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
index 54a8ffe..7955a0e 100644
--- a/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
+++ b/src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
@@ -39,10 +39,12 @@ public class WorkspaceController {
         String updateUserId = workspace.getUpdateUserId();
         if (T.StrUtil.isNotEmpty(createUserId)) {
             SysUserEntity createUser = userService.getById(createUserId);
+            createUser.setPwd(null);
             workspace.setCreateUser(createUser);
         }
         if (T.StrUtil.isNotEmpty(updateUserId)) {
             SysUserEntity updateUser = userService.getById(updateUserId);
+            updateUser.setPwd(null);
             workspace.setUpdateUser(updateUser);
         }
         return R.ok().putData("record", workspace);
diff --git a/src/main/resources/db/mapper/sys/SysUserMapper.xml b/src/main/resources/db/mapper/sys/SysUserMapper.xml
index 2c98ab4..66f8b9f 100644
--- a/src/main/resources/db/mapper/sys/SysUserMapper.xml
+++ b/src/main/resources/db/mapper/sys/SysUserMapper.xml
@@ -18,11 +18,13 @@
         <association property="createUser" columnPrefix="cu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
 
         <association property="updateUser" columnPrefix="uu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
     </resultMap>
 
@@ -31,8 +33,10 @@
         su.*,
         cu.id as cu_id,
         cu.name as cu_name,
+        cu.user_name as cu_user_name,
         uu.id as uu_id,
-        uu.id as uu_name
+        uu.name as uu_name,
+        uu.user_name as uu_user_name
         FROM
         sys_user su
         left join sys_user cu on su.create_user_id = cu.id
diff --git a/src/main/resources/db/mapper/workspace/WorkspaceMapper.xml b/src/main/resources/db/mapper/workspace/WorkspaceMapper.xml
index 9268de5..52b83fb 100644
--- a/src/main/resources/db/mapper/workspace/WorkspaceMapper.xml
+++ b/src/main/resources/db/mapper/workspace/WorkspaceMapper.xml
@@ -17,11 +17,13 @@
         <association property="createUser" columnPrefix="cu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
 
         <association property="updateUser" columnPrefix="uu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
     </resultMap>
 
@@ -30,8 +32,10 @@
         ws.*,
         cu.id AS cu_id,
         cu.name AS cu_name,
+        cu.user_name AS cu_user_name,
         uu.id AS uu_id,
-        uu.name AS uu_name
+        uu.name AS uu_name,
+        uu.user_name AS uu_user_name
         FROM
         workspace ws
         LEFT JOIN sys_user cu ON ws.create_user_id = cu.id