From c3eb6959d267362df452d97908193ead1b8f9e3f Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 17 May 2022 23:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0APP=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/api/DepartmentUserAppController.java     | 13 +++++++++++++
 .../controller/app/api/UserAppController.java    | 16 ++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/app/api/DepartmentUserAppController.java b/service-department/src/main/java/ink/wgink/service/department/controller/app/api/DepartmentUserAppController.java
index 31defe5a..199dba23 100644
--- a/service-department/src/main/java/ink/wgink/service/department/controller/app/api/DepartmentUserAppController.java
+++ b/service-department/src/main/java/ink/wgink/service/department/controller/app/api/DepartmentUserAppController.java
@@ -3,6 +3,7 @@ package ink.wgink.service.department.controller.app.api;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.dtos.department.DepartmentContainUserDTO;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
 import ink.wgink.pojo.result.ErrorResult;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -88,4 +89,16 @@ public class DepartmentUserAppController extends DefaultBaseController {
         return departmentUserService.listUserId(departmentId);
     }
 
+    @ApiOperation(value = "获取组织详情（包含本级用户列表与下级部门列表）", notes = "获取组织详情（包含本级用户列表与下级部门列表）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+            @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"),
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("get-department-contain-user-and-sub/department-id/{departmentId}")
+    public DepartmentContainUserDTO getDepartmentContainUserAndSubByDepartmentId(@RequestHeader("token") String token,
+                                                                                 @PathVariable("departmentId") String departmentId) {
+        return departmentUserService.getDepartmentContainUserAndSubByDepartmentId(departmentId);
+    }
+
 }
diff --git a/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java b/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java
index b1d161a7..d562b1b7 100644
--- a/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java
+++ b/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java
@@ -8,9 +8,11 @@ import ink.wgink.exceptions.SearchException;
 import ink.wgink.exceptions.UpdateException;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import ink.wgink.interfaces.sms.ISmsBaseService;
+import ink.wgink.pojo.dtos.user.UserDTO;
 import ink.wgink.pojo.result.ErrorResult;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.vos.IdsVO;
 import ink.wgink.pojo.vos.UpdatePhonePasswordVO;
 import ink.wgink.service.user.pojo.dtos.AppUserDTO;
 import ink.wgink.pojo.vos.UpdatePasswordVO;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * When you feel like quitting. Think about why you started
@@ -176,4 +179,17 @@ public class UserAppController extends DefaultBaseController {
         userService.downLoadAvatar(userId, request, response);
     }
 
+    @ApiOperation(value = "通过ID列表获取用户列表", notes = "通过ID列表获取用户列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", paramType = "header")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @PostMapping("list/ids")
+    public List<UserDTO> listByIds(@RequestHeader("token") String token, @RequestBody IdsVO idsVO) {
+        if (idsVO.getIds().isEmpty()) {
+            throw new ParamsException("id列表不能为空");
+        }
+        return userService.listByUserIds(idsVO.getIds());
+    }
+
 }