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 saveMember(String workspaceId, List workspaces) { - validateInfo(workspaceId, workspaces); - workspaceMemberService.saveBatch(workspaces); + public List saveMember(String workspaceId, List memberList) { + validateInfo(workspaceId, memberList); + workspaceMemberService.saveBatch(memberList); Map params = T.MapUtil.builder("workspaceId", workspaceId).build(); List memberEntityList = workspaceMemberService.queryList(params); return memberEntityList; } @Override - public List updateMember(String workspaceId, List workspaces) { - validateInfo(workspaceId, workspaces); + public List updateMember(String workspaceId, List memberList) { + validateInfo(workspaceId, memberList); workspaceMemberService.remove(new LambdaQueryWrapper().eq(WorkspaceMemberEntity::getWorkspaceId, workspaceId)); - workspaceMemberService.saveBatch(workspaces); + workspaceMemberService.saveBatch(memberList); Map params = T.MapUtil.builder("workspaceId", workspaceId).build(); List memberEntityList = workspaceMemberService.queryList(params); return memberEntityList; } - private void validateInfo(String workspaceId, List workspaces) { + private void validateInfo(String workspaceId, List memberList) { if (T.StrUtil.equalsIgnoreCase(workspaceId, "1")) { throw new ASWException(RCode.WORKSPACE_BUILT_IN); } List userIds = userService.list().stream().map(x -> x.getId()).toList(); List 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 { + 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 @@ + @@ -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,