From 1895a9e8090cbe353b8a486d0564a9e24631197d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 9 Jun 2022 08:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20AdminUserApi=20=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=92=8C=20Cloud=20=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/system/api/user/AdminUserApi.java | 14 +++++++++++++-
 .../module/system/api/user/AdminUserApiImpl.java   | 13 ++++++-------
 .../module/system/convert/user/UserConvert.java    |  3 ---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
index d994b0cb3..6c0b7e9d9 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.api.user;
 
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 
 import java.util.Collection;
@@ -22,6 +23,14 @@ public interface AdminUserApi {
      */
     AdminUserRespDTO getUser(Long id);
 
+    /**
+     * 通过用户 ID 查询用户们
+     *
+     * @param ids 用户 ID 们
+     * @return 用户对象信息
+     */
+    List<AdminUserRespDTO> getUsers(Collection<Long> ids);
+
     /**
      * 获得指定部门的用户数组
      *
@@ -44,7 +53,10 @@ public interface AdminUserApi {
      * @param ids 用户编号数组
      * @return 用户 Map
      */
-    Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids);
+    default Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids) {
+        List<AdminUserRespDTO> users = getUsers(ids);
+        return CollectionUtils.convertMap(users, AdminUserRespDTO::getId);
+    }
 
     /**
      * 校验用户们是否有效。如下情况，视为无效：
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
index 372e6f5e6..d493b747a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -29,6 +28,12 @@ public class AdminUserApiImpl implements AdminUserApi {
         return UserConvert.INSTANCE.convert4(user);
     }
 
+    @Override
+    public List<AdminUserRespDTO> getUsers(Collection<Long> ids) {
+        List<AdminUserDO> users = userService.getUsers(ids);
+        return UserConvert.INSTANCE.convertList4(users);
+    }
+
     @Override
     public List<AdminUserRespDTO> getUsersByDeptIds(Collection<Long> deptIds) {
         List<AdminUserDO> users = userService.getUsersByDeptIds(deptIds);
@@ -41,12 +46,6 @@ public class AdminUserApiImpl implements AdminUserApi {
         return UserConvert.INSTANCE.convertList4(users);
     }
 
-    @Override
-    public Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids) {
-        Map<Long, AdminUserDO> userMap = userService.getUserMap(ids);
-        return UserConvert.INSTANCE.convertMap4(userMap);
-    }
-
     @Override
     public void validUsers(Set<Long> ids) {
         userService.validUsers(ids);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java
index 2e8a47336..9a2aac3c5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java
@@ -14,7 +14,6 @@ import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface UserConvert {
@@ -53,6 +52,4 @@ public interface UserConvert {
 
     List<AdminUserRespDTO> convertList4(List<AdminUserDO> users);
 
-    Map<Long, AdminUserRespDTO> convertMap4(Map<Long, AdminUserDO> map);
-
 }