From 1e355322dab4f10696cd1240dfd3b9a9fcfe4863 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 18 Apr 2024 18:10:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8E=E6=9D=83=E9=99=90=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1039710 --user=宋昌昌 【项目管理】项目与权限-成员-全选所有页-切换用户组/搜索框搜索-所选择数量错误 https://www.tapd.cn/55049933/s/1501228
---
 .../controller/ProjectMemberController.java   |  7 ++--
 .../mapper/ExtProjectUserRoleMapper.java      |  9 +++--
 .../mapper/ExtProjectUserRoleMapper.xml       |  2 +-
 .../request/ProjectMemberAddRoleRequest.java  | 27 +++++++++++++++
 .../project/service/ProjectMemberService.java | 33 ++++++++++++++-----
 .../ProjectMemberControllerTests.java         | 23 ++++++++-----
 6 files changed, 76 insertions(+), 25 deletions(-)
 create mode 100644 backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectMemberAddRoleRequest.java

diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectMemberController.java b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectMemberController.java
index 99db476e0b..f7443b6237 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectMemberController.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectMemberController.java
@@ -3,10 +3,7 @@ package io.metersphere.project.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.project.dto.ProjectUserDTO;
-import io.metersphere.project.request.ProjectMemberAddRequest;
-import io.metersphere.project.request.ProjectMemberBatchDeleteRequest;
-import io.metersphere.project.request.ProjectMemberEditRequest;
-import io.metersphere.project.request.ProjectMemberRequest;
+import io.metersphere.project.request.*;
 import io.metersphere.project.service.ProjectMemberService;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.system.dto.CommentUserInfo;
@@ -98,7 +95,7 @@ public class ProjectMemberController {
     @Operation(summary = "项目管理-成员-批量添加至用户组")
     @RequiresPermissions(PermissionConstants.PROJECT_USER_UPDATE)
     @CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project")
-    public void addMemberRole(@RequestBody ProjectMemberAddRequest request) {
+    public void addMemberRole(@RequestBody ProjectMemberAddRoleRequest request) {
         projectMemberService.addRole(request, SessionUtils.getUserId());
     }
 
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.java b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.java
index 14b840a355..a0c6b90c45 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.java
@@ -1,12 +1,12 @@
 package io.metersphere.project.mapper;
 
 import io.metersphere.project.dto.ProjectUserRoleDTO;
-import io.metersphere.project.request.ProjectMemberBatchDeleteRequest;
 import io.metersphere.project.request.ProjectUserRoleMemberRequest;
 import io.metersphere.project.request.ProjectUserRoleRequest;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.domain.UserRoleRelation;
 import io.metersphere.system.dto.sdk.OptionDTO;
+import io.metersphere.system.dto.table.TableBatchProcessDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -57,5 +57,10 @@ public interface ExtProjectUserRoleMapper {
      */
     List<OptionDTO> getProjectUserSelectList(@Param("projectId") String projectId, @Param("keyword") String keyword);
 
-    List<String>getProjectRoleMemberIds(@Param("request") ProjectMemberBatchDeleteRequest request);
+    /**
+     * 根据列表参数获取选中的用户ID集合
+     * @param request 列表请求参数
+     * @return 用户ID集合
+     */
+    List<String> getProjectRoleMemberIds(@Param("request") TableBatchProcessDTO request);
 }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml
index c561598bc6..5c691d6d5f 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml
@@ -65,7 +65,7 @@
     </select>
 
     <select id="getProjectRoleMemberIds" resultType="java.lang.String">
-        select u.id,
+        select distinct u.id
         from `user` u
         left join user_role_relation urr on urr.user_id = u.id
         where urr.source_id = #{request.projectId} and u.deleted = false
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectMemberAddRoleRequest.java b/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectMemberAddRoleRequest.java
new file mode 100644
index 0000000000..7690a9e20f
--- /dev/null
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectMemberAddRoleRequest.java
@@ -0,0 +1,27 @@
+package io.metersphere.project.request;
+
+import io.metersphere.system.dto.table.TableBatchProcessDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author song-cc-rock
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ProjectMemberAddRoleRequest extends TableBatchProcessDTO implements Serializable {
+
+	@Schema(description =  "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
+	@NotBlank(message = "{project.id.not_blank}")
+	private String projectId;
+
+	@Schema(description =  "用户组ID集合", requiredMode = Schema.RequiredMode.REQUIRED)
+	@NotEmpty(message = "{user_role.id.not_blank}")
+	private List<String> roleIds;
+}
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
index 4e1e640955..30e457de29 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
@@ -5,10 +5,7 @@ import io.metersphere.project.dto.ProjectUserDTO;
 import io.metersphere.project.mapper.ExtProjectMemberMapper;
 import io.metersphere.project.mapper.ExtProjectUserRoleMapper;
 import io.metersphere.project.mapper.ProjectMapper;
-import io.metersphere.project.request.ProjectMemberAddRequest;
-import io.metersphere.project.request.ProjectMemberBatchDeleteRequest;
-import io.metersphere.project.request.ProjectMemberEditRequest;
-import io.metersphere.project.request.ProjectMemberRequest;
+import io.metersphere.project.request.*;
 import io.metersphere.sdk.constants.HttpMethodConstants;
 import io.metersphere.sdk.constants.InternalUserRole;
 import io.metersphere.sdk.constants.UserRoleEnum;
@@ -160,7 +157,12 @@ public class ProjectMemberService {
      * @param currentUserId 当前用户ID
      */
     public void addMember(ProjectMemberAddRequest request, String currentUserId) {
-        addMemberRole(request, currentUserId, OperationLogType.ADD.name(), "/project/member/add");
+        ProjectMemberAddRoleRequest roleRequest = new ProjectMemberAddRoleRequest();
+        roleRequest.setProjectId(request.getProjectId());
+        roleRequest.setRoleIds(request.getRoleIds());
+        roleRequest.setSelectAll(false);
+        roleRequest.setSelectIds(request.getUserIds());
+        addMemberRole(roleRequest, currentUserId, OperationLogType.ADD.name(), "/project/member/add");
     }
 
     /**
@@ -250,7 +252,7 @@ public class ProjectMemberService {
      * @param request       请求参数
      * @param currentUserId 当前用户ID
      */
-    public void addRole(ProjectMemberAddRequest request, String currentUserId) {
+    public void addRole(ProjectMemberAddRoleRequest request, String currentUserId) {
         // 添加用户用户组(已经添加的用户组不再添加)
         addMemberRole(request, currentUserId, OperationLogType.UPDATE.name(), "/project/member/add-role");
     }
@@ -263,21 +265,34 @@ public class ProjectMemberService {
      * @param operationType 操作记录类型
      * @param path          操作记录路径
      */
-    public void addMemberRole(ProjectMemberAddRequest request, String currentUserId, String operationType, String path) {
+    public void addMemberRole(ProjectMemberAddRoleRequest request, String currentUserId, String operationType, String path) {
         // 操作记录
         List<LogDTO> logs = new ArrayList<>();
         // 项目不存在, 则不添加
         Project project = checkProjectExist(request.getProjectId());
+        if (!request.isSelectAll() && CollectionUtils.isEmpty(request.getSelectIds())) {
+            throw new MSException(Translator.get("user.not.empty"));
+        }
+        // 批量移除成员, 则移除该成员在该项目下的所有用户组
+        List<String> userIds;
+        if (request.isSelectAll()) {
+            userIds = extProjectUserRoleMapper.getProjectRoleMemberIds(request);
+            if (!CollectionUtils.isEmpty(request.getExcludeIds())) {
+                userIds.removeAll(request.getExcludeIds());
+            }
+        } else {
+            userIds = request.getSelectIds();
+        }
         // 获取已经存在的用户组
         UserRoleRelationExample example = new UserRoleRelationExample();
         example.createCriteria().andSourceIdEqualTo(request.getProjectId())
-                .andUserIdIn(request.getUserIds()).andRoleIdIn(request.getRoleIds());
+                .andUserIdIn(userIds).andRoleIdIn(request.getRoleIds());
         List<UserRoleRelation> userRoleRelations = userRoleRelationMapper.selectByExample(example);
         Map<String, List<String>> existUserRelations = userRoleRelations.stream().collect(
                 Collectors.groupingBy(UserRoleRelation::getUserId, Collectors.mapping(UserRoleRelation::getRoleId, Collectors.toList())));
         // 比较用户组是否已经存在, 如果不存在则添加
         List<UserRoleRelation> relations = new ArrayList<>();
-        request.getUserIds().forEach(userId -> {
+        userIds.forEach(userId -> {
             AtomicBoolean isLog = new AtomicBoolean(false);
             // 追加的用户组ID, 操作记录使用
             List<String> roleIds = new ArrayList<>();
diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectMemberControllerTests.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectMemberControllerTests.java
index 7402f0f95c..ca2f9bed1f 100644
--- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectMemberControllerTests.java
+++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectMemberControllerTests.java
@@ -1,10 +1,7 @@
 package io.metersphere.project.controller;
 
 import io.metersphere.project.dto.ProjectUserDTO;
-import io.metersphere.project.request.ProjectMemberAddRequest;
-import io.metersphere.project.request.ProjectMemberBatchDeleteRequest;
-import io.metersphere.project.request.ProjectMemberEditRequest;
-import io.metersphere.project.request.ProjectMemberRequest;
+import io.metersphere.project.request.*;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.util.JSON;
@@ -202,10 +199,16 @@ public class ProjectMemberControllerTests extends BaseTest {
     @Test
     @Order(13)
     public void testAddMemberRoleSuccess() throws Exception {
-        ProjectMemberAddRequest request = new ProjectMemberAddRequest();
+        ProjectMemberAddRoleRequest request = new ProjectMemberAddRoleRequest();
         request.setProjectId("default-project-member-test");
-        request.setUserIds(List.of("default-project-member-user-1", "default-project-member-user-2"));
+        request.setSelectIds(List.of("default-project-member-user-1", "default-project-member-user-2"));
         request.setRoleIds(List.of("project_admin", "project_member"));
+        request.setSelectAll(false);
+        this.requestPost(ADD_ROLE, request, status().isOk());
+        request.setSelectAll(true);
+        request.setSelectIds(List.of());
+        this.requestPost(ADD_ROLE, request, status().isOk());
+        request.setExcludeIds(List.of("project_admin"));
         this.requestPost(ADD_ROLE, request, status().isOk());
         // 权限校验
         request.setProjectId(DEFAULT_PROJECT_ID);
@@ -215,11 +218,15 @@ public class ProjectMemberControllerTests extends BaseTest {
     @Test
     @Order(14)
     public void testAddMemberRoleError() throws Exception {
-        ProjectMemberAddRequest request = new ProjectMemberAddRequest();
+        ProjectMemberAddRoleRequest request = new ProjectMemberAddRoleRequest();
         request.setProjectId("default-project-member-x");
-        request.setUserIds(List.of("default-project-member-user-1", "default-project-member-user-2"));
+        request.setSelectAll(false);
+        request.setSelectIds(List.of("default-project-member-user-1", "default-project-member-user-2"));
         request.setRoleIds(List.of("project_admin", "project_member"));
         this.requestPost(ADD_ROLE, request, status().is5xxServerError());
+        request.setProjectId("default-project-member-test");
+        request.setSelectIds(List.of());
+        this.requestPost(ADD_ROLE, request, status().is5xxServerError());
     }
 
     @Test