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 161d904..f80a5e3 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 @@ -2,6 +2,7 @@ package net.geedge.asw.module.workspace.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.geedge.asw.common.util.ASWException; import net.geedge.asw.common.util.RCode; @@ -50,9 +51,22 @@ public class WorkspaceMemberServiceImpl extends ServiceImpl updateMember(String workspaceId, List memberList) { - validateInfo(workspaceId, memberList); - workspaceMemberService.remove(new LambdaQueryWrapper().eq(WorkspaceMemberEntity::getWorkspaceId, workspaceId)); - workspaceMemberService.saveBatch(memberList); + List list = this.list(new LambdaQueryWrapper().eq(WorkspaceMemberEntity::getWorkspaceId, workspaceId)); + List userIds = list.stream().map(x -> x.getUserId()).toList(); + for (WorkspaceMemberEntity member : memberList) { + String userId = member.getUserId(); + if (!userIds.contains(userId)) { + this.update(new LambdaUpdateWrapper() + .eq(WorkspaceMemberEntity::getUserId, userId) + .eq(WorkspaceMemberEntity::getWorkspaceId, workspaceId) + .set(WorkspaceMemberEntity::getRoleId, member.getRoleId())); + }else { + member.setWorkspaceId(workspaceId); + member.setCreateTimestamp(System.currentTimeMillis()); + member.setCreateUserId(StpUtil.getLoginIdAsString()); + this.save(member); + } + } Map params = T.MapUtil.builder("workspaceId", workspaceId).build(); List memberEntityList = workspaceMemberService.queryList(params); return memberEntityList;