From 90301ae75e0049dce15e424a6958c6095c2a200f Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Thu, 5 Sep 2024 13:54:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20workspace=20member?=
 =?UTF-8?q?=20=E5=93=8D=E5=BA=94=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0=20use?=
 =?UTF-8?q?rname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WorkspaceMemberServiceImpl.java       | 18 +++++++++---------
 .../mapper/workspace/WorkspaceMemberMapper.xml |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceMemberServiceImpl.java b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceMemberServiceImpl.java
index 3bd7b6a..04c0605 100644
--- a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceMemberServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceMemberServiceImpl.java
@@ -37,31 +37,31 @@ public class WorkspaceMemberServiceImpl extends ServiceImpl<WorkspaceMemberDao,
     }
 
     @Override
-    public List<WorkspaceMemberEntity> saveMember(String workspaceId, List<WorkspaceMemberEntity> workspaces) {
-        validateInfo(workspaceId, workspaces);
-        workspaceMemberService.saveBatch(workspaces);
+    public List<WorkspaceMemberEntity> saveMember(String workspaceId, List<WorkspaceMemberEntity> memberList) {
+        validateInfo(workspaceId, memberList);
+        workspaceMemberService.saveBatch(memberList);
         Map params  = T.MapUtil.builder("workspaceId", workspaceId).build();
         List<WorkspaceMemberEntity> memberEntityList = workspaceMemberService.queryList(params);
         return memberEntityList;
     }
 
     @Override
-    public List<WorkspaceMemberEntity> updateMember(String workspaceId, List<WorkspaceMemberEntity> workspaces) {
-        validateInfo(workspaceId, workspaces);
+    public List<WorkspaceMemberEntity> updateMember(String workspaceId, List<WorkspaceMemberEntity> memberList) {
+        validateInfo(workspaceId, memberList);
         workspaceMemberService.remove(new LambdaQueryWrapper<WorkspaceMemberEntity>().eq(WorkspaceMemberEntity::getWorkspaceId, workspaceId));
-        workspaceMemberService.saveBatch(workspaces);
+        workspaceMemberService.saveBatch(memberList);
         Map params  = T.MapUtil.builder("workspaceId", workspaceId).build();
         List<WorkspaceMemberEntity> memberEntityList = workspaceMemberService.queryList(params);
         return memberEntityList;
     }
 
-    private void validateInfo(String workspaceId, List<WorkspaceMemberEntity> workspaces) {
+    private void validateInfo(String workspaceId, List<WorkspaceMemberEntity> memberList) {
         if (T.StrUtil.equalsIgnoreCase(workspaceId, "1")) {
             throw new ASWException(RCode.WORKSPACE_BUILT_IN);
         }
         List<String> userIds = userService.list().stream().map(x -> x.getId()).toList();
         List<String> roleIds = roleService.list().stream().map(x -> x.getId()).toList();
-        for (WorkspaceMemberEntity workspace : workspaces) {
+        for (WorkspaceMemberEntity workspace : memberList) {
             VerifyUtil.is(workspace).notNull()
                     .and(workspace.getUserId()).notEmpty(RCode.USER_ID_CANNOT_EMPTY)
                     .and(workspace.getRoleId()).notEmpty(RCode.ROLE_ID_CANNOT_EMPTY);
@@ -72,7 +72,7 @@ public class WorkspaceMemberServiceImpl extends ServiceImpl<WorkspaceMemberDao,
                 throw new ASWException(RCode.ROLE_NOT_EXIST);
             }
         }
-        workspaces.stream().forEach(x -> {
+        memberList.stream().forEach(x -> {
             x.setWorkspaceId(workspaceId);
             x.setCreateUserId(StpUtil.getLoginIdAsString());
             x.setCreateTimestamp(System.currentTimeMillis());
diff --git a/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml b/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
index 125b712..f5ed9a2 100644
--- a/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
+++ b/src/main/resources/db/mapper/workspace/WorkspaceMemberMapper.xml
@@ -13,6 +13,7 @@
         <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="user" columnPrefix="su_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
@@ -36,6 +37,7 @@
         wm.*,
         cu.id AS cu_id,
         cu.name AS cu_name,
+        cu.user_name AS cu_user_name,
         su.id AS su_id,
         su.name AS su_name,
         sr.id AS sr_id,