From 8e9e01a8b4841e9860a34dfc8ba30a7430757b55 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 4 Sep 2023 15:30:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E7=BB=84=E7=BB=87=E4=B8=8E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE&=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=94=A8=E6=88=B7=E9=80=89=E9=A1=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SystemOrganizationController.java         |  6 ++-
 .../system/mapper/ExtUserMapper.java          |  2 +-
 .../system/mapper/ExtUserMapper.xml           |  4 ++
 .../service/OrganizationUserRoleService.java  | 41 +++++++++++++------
 .../system/service/UserService.java           |  4 +-
 .../OrganizationUserRoleControllerTests.java  |  3 ++
 .../dml/init_organization_user_role.sql       |  4 +-
 7 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
index 456c48d4ad..a1903b95cc 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
@@ -118,7 +118,9 @@ public class SystemOrganizationController {
     @Operation(summary = "系统设置-系统-组织与项目-获取成员下拉选项")
     @RequiresPermissions(value = {PermissionConstants.SYSTEM_ORGANIZATION_PROJECT_READ})
     @Parameter(name = "sourceId", description = "组织ID或项目ID", schema = @Schema(requiredMode = Schema.RequiredMode.REQUIRED))
-    public List<UserExtend> getMemberOption(@PathVariable String sourceId) {
-        return userService.getMemberOption(sourceId);
+    public List<UserExtend> getMemberOption(@PathVariable String sourceId,
+                                            @Schema(description = "查询关键字，根据邮箱和用户名查询")
+                                            @RequestParam(value = "keyword", required = false) String keyword) {
+        return userService.getMemberOption(sourceId, keyword);
     }
 }
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.java
index cdb6ab9c88..db23176211 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface ExtUserMapper {
 
-    List<UserExtend> getMemberOption(String sourceId);
+    List<UserExtend> getMemberOption(@Param("sourceId") String sourceId, @Param("keyword") String keyword);
 
     List<User> getUserListByOrgId(@Param("sourceId") String sourceId, @Param("keyword") String keyword);
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml
index ddc94b9ac5..a2c4bab3f8 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml
@@ -5,7 +5,11 @@
         select distinct u.*, count(urr.id) > 0 as memberFlag
         from `user` u left join user_role_relation urr on urr.user_id = u.id and urr.source_id = #{sourceId}
         where u.deleted = 0
+        <if test="keyword != null and keyword != ''">
+            and (u.name like concat('%', #{keyword}, '%') or u.email like concat('%', #{keyword}, '%'))
+        </if>
         group by u.id
+        limit 100
     </select>
 
     <select id="getUserListByOrgId" resultType="io.metersphere.system.domain.User">
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
index 464ecde029..256f9f6aae 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
@@ -8,6 +8,7 @@ import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.mapper.BaseUserMapper;
 import io.metersphere.sdk.service.BaseUserRoleService;
+import io.metersphere.sdk.service.BaseUserService;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.*;
@@ -42,6 +43,8 @@ public class OrganizationUserRoleService extends BaseUserRoleService {
     @Resource
     BaseUserMapper baseUserMapper;
     @Resource
+    BaseUserService baseUserService;
+    @Resource
     UserRoleMapper userRoleMapper;
     @Resource
     ExtUserRoleMapper extUserRoleMapper;
@@ -83,9 +86,6 @@ public class OrganizationUserRoleService extends BaseUserRoleService {
 
     public List<UserExtend> getMember(String organizationId, String roleId) {
         List<UserExtend> userExtends = new ArrayList<>();
-        // 查询所有用户
-        List<User> users = baseUserMapper.findAll();
-        Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, user -> user));
         // 查询组织下所有用户关系
         UserRoleRelationExample example = new UserRoleRelationExample();
         example.createCriteria().andSourceIdEqualTo(organizationId);
@@ -95,17 +95,32 @@ public class OrganizationUserRoleService extends BaseUserRoleService {
                     Collectors.mapping(UserRoleRelation::getRoleId, Collectors.toList())));
             userRoleMap.forEach((k, v) -> {
                 UserExtend userExtend = new UserExtend();
-                User user = userMap.get(k);
-                if (user != null) {
-                    BeanUtils.copyBean(userExtend, user);
-                    v.forEach(roleItem -> {
-                        if (StringUtils.equals(roleItem, roleId)) {
-                            userExtend.setCheckRoleFlag(true);
-                        }
-                    });
-                    userExtends.add(userExtend);
-                }
+                userExtend.setId(k);
+                v.forEach(roleItem -> {
+                    if (StringUtils.equals(roleItem, roleId)) {
+                        // 该用户已存在用户组关系, 设置为选中状态
+                        userExtend.setCheckRoleFlag(true);
+                    }
+                });
+                userExtends.add(userExtend);
             });
+            // 设置用户信息, 用户不存在或者已删除, 则不展示
+            List<String> userIds = userExtends.stream().map(UserExtend::getId).toList();
+            UserExample userExample = new UserExample();
+            userExample.createCriteria().andIdIn(userIds).andDeletedEqualTo(false);
+            List<User> users = userMapper.selectByExample(userExample);
+            if (CollectionUtils.isNotEmpty(users)) {
+                Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, user -> user));
+                userExtends.removeIf(userExtend -> {
+                    if (userMap.containsKey(userExtend.getId())) {
+                        BeanUtils.copyBean(userExtend, userMap.get(userExtend.getId()));
+                        return false;
+                    }
+                    return true;
+                });
+            } else {
+                userExtends.clear();
+            }
         }
         return userExtends;
     }
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java
index 0c35cefb7f..24a8188361 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java
@@ -307,8 +307,8 @@ public class UserService {
      * @param sourceId 组织ID, 项目ID
      * @return 系统用户选项
      */
-    public List<UserExtend> getMemberOption(String sourceId) {
-        return extUserMapper.getMemberOption(sourceId);
+    public List<UserExtend> getMemberOption(String sourceId, String keyword) {
+        return extUserMapper.getMemberOption(sourceId, keyword);
     }
 
     public TableBatchProcessResponse resetPassword(TableBatchProcessDTO request, String operator) {
diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java
index 58e9a11ce8..b926bae35d 100644
--- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java
+++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java
@@ -322,7 +322,10 @@ public class OrganizationUserRoleControllerTests extends BaseTest {
     @Test
     @Order(15)
     public void testOrganizationUserRoleGetMemberOption() throws Exception {
+        // 组织下存在已删除用户
         this.responseGet(ORGANIZATION_USER_ROLE_GET_MEMBER_OPTION + "/default-organization-2/default-org-role-id-4");
+        // 组织下用户都已删除
+        this.responseGet(ORGANIZATION_USER_ROLE_GET_MEMBER_OPTION + "/default-organization-4/default-org-role-id-3");
         // 组织下无用户
         this.responseGet(ORGANIZATION_USER_ROLE_GET_MEMBER_OPTION + "/default-organization-3/default-org-role-id-3");
     }
diff --git a/backend/services/system-setting/src/test/resources/dml/init_organization_user_role.sql b/backend/services/system-setting/src/test/resources/dml/init_organization_user_role.sql
index 4cd913a291..caa874874a 100644
--- a/backend/services/system-setting/src/test/resources/dml/init_organization_user_role.sql
+++ b/backend/services/system-setting/src/test/resources/dml/init_organization_user_role.sql
@@ -16,4 +16,6 @@ INSERT INTO user_role_relation (id, user_id, role_id, source_id, organization_id
 INSERT INTO user_role_relation (id, user_id, role_id, source_id, organization_id, create_time, create_user) VALUE
     (UUID(), 'default-admin-user', 'default-org-role-id-4', 'default-organization-2', 'default-organization-2', UNIX_TIMESTAMP() * 1000, 'admin');
 INSERT INTO user_role_relation (id, user_id, role_id, source_id, organization_id, create_time, create_user) VALUE
-    (UUID(), 'default-admin-user-x', 'default-org-role-id-4', 'default-organization-2', 'default-organization-2', UNIX_TIMESTAMP() * 1000, 'admin');
\ No newline at end of file
+    (UUID(), 'default-admin-user-x', 'default-org-role-id-4', 'default-organization-2', 'default-organization-2', UNIX_TIMESTAMP() * 1000, 'admin');
+INSERT INTO user_role_relation (id, user_id, role_id, source_id, organization_id, create_time, create_user) VALUE
+    (UUID(), 'default-admin-user-x', 'default-org-role-id-3', 'default-organization-4', 'default-organization-4', UNIX_TIMESTAMP() * 1000, 'admin');
\ No newline at end of file