查询所有的组员接口

gic-platform-auth-api/src/main/java/com/gic/auth/service/AccountGroupApiService.java

@@ -99,6 +99,18 @@ public interface AccountGroupApiService {
     ServiceResponse<List<AccountGroupMemberDTO>> listNotInAccountGroupByAccountGroupId(Integer accountGroupId,
             String search);
 
+
+    /**
+     * 查询商户所有组员
+     * @Title: listAllMember

+     * @Description:
+    
 * @author guojuxing
+     * @param search

+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.AccountGroupMemberDTO>>

+    
 */
+    ServiceResponse<List<AccountGroupMemberDTO>> listAllMember(String search, Integer enterpriseId);
+
     /**
      * 查询在对应账号分组内的所有组员
      * @Title: listNotInAccountGroupByAccountGroupId


gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AccountGroupApiServiceImpl.java

@@ -161,6 +161,16 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
     }
 
     @Override
+    ServiceResponse<List<AccountGroupMemberDTO>> listAllMember(String search, Integer enterpriseId) {
+        List<AccountGroupMemberDTO> result = new ArrayList<>();
+        //查询管理员列表
+        result.addAll(getMemberOfUser(null, false, search, enterpriseId));
+        // 查询协作人列表
+        result.addAll(getMemberOfCollaborator(null, false, search, enterpriseId));
+        return ServiceResponse.success(result);
+    }
+
+    @Override
     public ServiceResponse<List<AccountGroupMemberDTO>> listInAccountGroupByAccountGroupId(Integer accountGroupId,
             String search) {
         TabSysAccountGroup record = accountGroupService.getById(accountGroupId);

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/AccountGroupController.java

@@ -86,8 +86,7 @@ public class AccountGroupController {
     public RestResponse deleteAccountGroup(Integer accountGroupId) {
         ServiceResponse<AccountGroupDTO> result = accountGroupApiService.deleteByAccountGroupId(accountGroupId);
         String operationObject = result.isSuccess() ? result.getResult().getAccountGroupName() : null;
-        return OperationResultUtils.operationResult(result, OperationResultUtils.LOG_DELETE + "账号分组",
-                operationObject);
+        return OperationResultUtils.operationResult(result, OperationResultUtils.LOG_DELETE + "账号分组", operationObject);
     }
 
     @RequestMapping("/sort")
@@ -143,6 +142,17 @@ public class AccountGroupController {
                 .commonResult(accountGroupApiService.listInAccountGroupByAccountGroupId(accountGroupId, search));
     }
 
+    /**
+     * 查询所有组员，创建分组的时候直接添加组员使用
+     * @param search
+     * @return
+     */
+    @RequestMapping("/list-all-member")
+    public RestResponse listAllMember(String search) {
+        return ResultControllerUtils.commonResult(
+                accountGroupApiService.listAllMember(search, UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
+
     @RequestMapping("/grouping")
     public RestResponse grouping(@NotBlank(message = "账号分组ID不能为空") String accountGroupIds,
             @NotBlank(message = "组员ID不能为空") String userIds, @NotNull(message = "组员类型不能为空") Integer type) {