超管用户管理

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java

@@ -5,7 +5,6 @@ import com.accompany.admin.vo.UsersAdminVo;
 import com.accompany.business.constant.SymbolConstants;
 import com.accompany.business.event.UsersChangePartitionEvent;
 import com.accompany.business.model.PrivatePhoto;
-import com.accompany.business.model.UserInviteCode;
 import com.accompany.business.model.UserPurse;
 import com.accompany.business.mybatismapper.PrivatePhotoMapper;
 import com.accompany.business.mybatismapper.UserInviteCodeMapper;
@@ -134,7 +133,7 @@ public class UserCheckAdminService {
         return list;
     }
 
-    private List<UsersAdminVo> getUserListByErbanNoList(List<String> erbanNoList){
+    public List<UsersAdminVo> getUserListByErbanNoList(List<String> erbanNoList){
         List<Long> newList = new ArrayList<>(erbanNoList.size());
         for(String myErbanNo: erbanNoList){
             Long erbanNo = Long.valueOf(myErbanNo);

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildSuperAdminController.java

@@ -1,10 +1,15 @@
 package com.accompany.admin.controller.guild;
 
+import cn.hutool.core.util.StrUtil;
 import com.accompany.admin.base.Pagination;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.dto.NameplateDto;
+import com.accompany.admin.service.UserCheckAdminService;
 import com.accompany.admin.service.guild.GuildSuperAdminService;
 import com.accompany.admin.service.system.AdminLogService;
+import com.accompany.admin.service.system.AdminUserService;
+import com.accompany.admin.vo.AdminUserVo;
+import com.accompany.admin.vo.UsersAdminVo;
 import com.accompany.admin.vo.family.FamilyAdminVo;
 import com.accompany.admin.vo.guild.GuildApplyAuditVo;
 import com.accompany.admin.vo.vip.VipSendRecordVo;
@@ -17,18 +22,24 @@ import com.accompany.common.result.PageResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.enumeration.PartitionEnum;
 import com.accompany.core.exception.AdminServiceException;
+import com.accompany.core.service.region.RegionInfoService;
 import com.accompany.core.vo.BaseResponseVO;
+import com.accompany.core.vo.UserVo;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Api(tags = "超管中心")
 @RestController
@@ -38,6 +49,12 @@ public class GuildSuperAdminController extends BaseController {
     private AdminLogService adminLogService;
     @Autowired
     private GuildSuperAdminService guildSuperAdminService;
+    @Autowired
+    private UserCheckAdminService userCheckAdminService;
+    @Autowired
+    private RegionInfoService regionInfoService;
+    @Autowired
+    private AdminUserService adminUserService;
 
     @ApiOperation(value = "创建公会,对应前端页面GuildInfo，修改家族用已有接口：/admin/family/manage/update", httpMethod = "POST")
     @ApiImplicitParams({
@@ -199,4 +216,25 @@ public class GuildSuperAdminController extends BaseController {
                 getAdminId(), guildId, ownerErbanNo, basePageParams.getPageNo(), basePageParams.getPageSize()));
     }
 
+    @GetMapping("/userList")
+    public BusiResult<List<UsersAdminVo>> getList(String erbanNoList) {
+        if (StrUtil.isEmpty(erbanNoList)) {
+            return BusiResult.success();
+        }
+        List<String> oldList = Arrays.asList(erbanNoList.split(","));
+        List<UsersAdminVo> list = userCheckAdminService.getUserListByErbanNoList(oldList);
+        AdminUserVo adminUserVo = adminUserService.getByAdminId(getAdminId());
+        list = list.stream().filter(usersAdminVo -> adminUserVo.getPartitionIds().contains(usersAdminVo.getUsers().getPartitionId())).collect(Collectors.toList());
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            Map<Integer, String> regionName = regionInfoService.getRegionName();
+            for (UsersAdminVo usersAdminVo : list) {
+                UserVo users = usersAdminVo.getUsers();
+                if (users != null && users.getRegionId() != null) {
+                    usersAdminVo.setRegionName(regionName.get(users.getRegionId()));
+                }
+            }
+        }
+        return BusiResult.success(list);
+    }
 }