From 67270e43aaeaabda30f51c8317f77b373edf1257 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 3 Apr 2023 18:10:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1025058 --user=李玉号 【系统设置】删除工作空间-其关联的用户组同步被删除,用户编辑页面仍能看见该用户组 https://www.tapd.cn/55049933/s/1358831 --- .../main/java/io/metersphere/service/WorkspaceService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system-setting/backend/src/main/java/io/metersphere/service/WorkspaceService.java b/system-setting/backend/src/main/java/io/metersphere/service/WorkspaceService.java index 1ce7cd06a1..97f2cc7ff6 100644 --- a/system-setting/backend/src/main/java/io/metersphere/service/WorkspaceService.java +++ b/system-setting/backend/src/main/java/io/metersphere/service/WorkspaceService.java @@ -89,9 +89,14 @@ public class WorkspaceService { projectService.deleteProject(projectId); }); + projectIdList.add(workspaceId); + GroupExample groupExample = new GroupExample(); + groupExample.createCriteria().andScopeIdIn(projectIdList); + groupMapper.deleteByExample(groupExample); + // delete user group UserGroupExample userGroupExample = new UserGroupExample(); - userGroupExample.createCriteria().andSourceIdEqualTo(workspaceId); + userGroupExample.createCriteria().andSourceIdIn(projectIdList); userGroupMapper.deleteByExample(userGroupExample); environmentGroupService.deleteByWorkspaceId(workspaceId);