From 63fd0ded1769a5e4e5f011da5ac3e22a8dbebbc8 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Mon, 21 Oct 2024 15:51:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ASW-108=20=E8=B0=83=E6=95=B4=20workspace?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=20me?= =?UTF-8?q?mbers=20=E5=B1=9E=E6=80=A7=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkspaceController.java | 2 -- .../service/impl/WorkspaceServiceImpl.java | 32 +++++++++++-------- 2 files changed, 18 insertions(+), 16 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 7955a0e..73eb4b6 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 @@ -60,7 +60,6 @@ public class WorkspaceController { public R save(@RequestBody WorkspaceEntity workspace) { VerifyUtil.is(workspace).notNull() .and(workspace.getName()).notEmpty(RCode.WORKSPACE_NAME_CANNOT_EMPTY) - .and(workspace.getMembers()).notEmpty(RCode.WORKSPACE_MEMBER_CANNOT_EMPTY) .and(workspace.getVisibility()).notEmpty(RCode.WORKSPACE_VISIBILITY_CANNOT_EMPTY); WorkspaceEntity workspaceEntity = workspaceService.saveWorkspace(workspace); @@ -73,7 +72,6 @@ public class WorkspaceController { VerifyUtil.is(workspace).notNull() .and(workspace.getId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY) .and(workspace.getName()).notEmpty(RCode.WORKSPACE_NAME_CANNOT_EMPTY) - .and(workspace.getMembers()).notEmpty(RCode.WORKSPACE_MEMBER_CANNOT_EMPTY) .and(workspace.getVisibility()).notEmpty(RCode.WORKSPACE_VISIBILITY_CANNOT_EMPTY); WorkspaceEntity workspaceEntity = workspaceService.updateWorkspace(workspace); diff --git a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java index eeace9a..45530d5 100644 --- a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.geedge.asw.common.util.ASWException; -import net.geedge.asw.common.util.Constants; import net.geedge.asw.common.util.RCode; import net.geedge.asw.common.util.T; import net.geedge.asw.module.workspace.dao.WorkspaceDao; @@ -49,12 +48,14 @@ public class WorkspaceServiceImpl extends ServiceImpl members = workspace.getMembers(); - members.stream().forEach(x -> { - x.setWorkspaceId(workspace.getId()); - x.setCreateTimestamp(System.currentTimeMillis()); - x.setCreateUserId(StpUtil.getLoginIdAsString()); - }); - workspaceMemberService.saveBatch(members); + if (T.CollUtil.isNotEmpty(members)) { + members.stream().forEach(x -> { + x.setWorkspaceId(workspace.getId()); + x.setCreateTimestamp(System.currentTimeMillis()); + x.setCreateUserId(StpUtil.getLoginIdAsString()); + }); + workspaceMemberService.saveBatch(members); + } return workspace; } @@ -67,14 +68,17 @@ public class WorkspaceServiceImpl extends ServiceImpl members = workspace.getMembers(); - members.stream().forEach(x -> { - x.setWorkspaceId(workspace.getId()); - x.setCreateTimestamp(System.currentTimeMillis()); - x.setCreateUserId(StpUtil.getLoginIdAsString()); - }); workspaceMemberService.remove(new LambdaQueryWrapper().eq(WorkspaceMemberEntity::getWorkspaceId, workspace.getId())); - workspaceMemberService.saveBatch(members); + + List members = workspace.getMembers(); + if (T.CollUtil.isNotEmpty(members)) { + members.stream().forEach(x -> { + x.setWorkspaceId(workspace.getId()); + x.setCreateTimestamp(System.currentTimeMillis()); + x.setCreateUserId(StpUtil.getLoginIdAsString()); + }); + workspaceMemberService.saveBatch(members); + } return workspace; }