gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调整同 workspace 下 user 不能重复

Browse Source
This commit is contained in:
zhangshuai
2024-09-05 15:21:06 +08:00
parent 5d77111530
commit b7e3048e64
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceMemberServiceImpl.java
View File

@@ -59,9 +59,14 @@ public class WorkspaceMemberServiceImpl extends ServiceImpl<WorkspaceMemberDao,
if (T.StrUtil.equalsIgnoreCase(workspaceId, "1")) { if (T.StrUtil.equalsIgnoreCase(workspaceId, "1")) {
throw new ASWException(RCode.WORKSPACE_BUILT_IN); throw new ASWException(RCode.WORKSPACE_BUILT_IN);
} }
long count = memberList.stream().map(x -> x.getUserId()).distinct().count();
if (count != memberList.size()) { List userIdList = memberList.stream().map(x -> x.getUserId()).toList();
throw new ASWException(RCode.WORKSPACE_MEMBER_USER_ID_REPEAT); List<WorkspaceMemberEntity> memberEntityList = workspaceMemberService.list(new LambdaQueryWrapper<WorkspaceMemberEntity>().eq(WorkspaceMemberEntity::getWorkspaceId, workspaceId));
if (T.CollectionUtil.isNotEmpty(memberList)){
memberEntityList = memberEntityList.stream().filter(x -> userIdList.contains(x.getUserId())).toList();
if (T.CollectionUtil.isNotEmpty(memberEntityList)) {
throw new ASWException(RCode.WORKSPACE_MEMBER_USER_ID_REPEAT);
}
} }
List<String> userIds = userService.list().stream().map(x -> x.getId()).toList(); List<String> userIds = userService.list().stream().map(x -> x.getId()).toList();
List<String> roleIds = roleService.list().stream().map(x -> x.getId()).toList(); List<String> roleIds = roleService.list().stream().map(x -> x.getId()).toList();