1、会议室预定信息分页列表返回申请人名字

2、获取登录员工及相关权限信息

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/meeting/reserve/OaMeetingReserveController.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.bpm.api.metting.room.vo.OaMeetingRoomRespDTO;
@@ -16,6 +17,8 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.meeting.reserve.OaMeetingReser
 import cn.iocoder.yudao.module.bpm.enums.MeetingReserveStatusEnum;
 import cn.iocoder.yudao.module.bpm.service.meeting.reserve.OaMeetingReserveService;
 import cn.iocoder.yudao.module.bpm.service.meeting.room.OaMeetingRoomService;
+import cn.iocoder.yudao.module.employee.api.EmployeeApi;
+import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -52,7 +55,7 @@ public class OaMeetingReserveController {
     private OaMeetingReserveService oaMeetingReserveService;
 
     @Resource
-    private AdminUserApi adminUserApi;
+    private EmployeeApi employeeApi;
 
     @Resource
     private DeptApi deptApi;
@@ -97,8 +100,8 @@ public class OaMeetingReserveController {
             List<Long> participantsLongList = Arrays.stream(participantsStringArray).map(Long::valueOf).collect(Collectors.toList());
             oaMeetingReserveRespVO.setParticipants(participantsLongList);
 
-            List<AdminUserRespDTO> userList = adminUserApi.getUserList(participantsLongList);
-            String participantsName = userList.stream().map(AdminUserRespDTO::getNickname).collect(Collectors.joining(","));
+            List<EmployeeRespDTO> employeeRespDTOList = employeeApi.getEmployeeListByIds(participantsLongList);
+            String participantsName = employeeRespDTOList.stream().map(EmployeeRespDTO::getName).collect(Collectors.joining(","));
             oaMeetingReserveRespVO.setParticipantsName(participantsName);
         } else {
             oaMeetingReserveRespVO.setParticipants(Collections.emptyList());
@@ -106,8 +109,8 @@ public class OaMeetingReserveController {
         // 申请人
         Long applyEmployeeId = oaMeetingReserve.getApplyEmployeeId();
         if (applyEmployeeId != null) {
-            AdminUserRespDTO user = adminUserApi.getUser(applyEmployeeId);
-            oaMeetingReserveRespVO.setApplyEmployeeName(user.getNickname());
+            EmployeeRespDTO employeeRespDTO = employeeApi.getEmployeeById(applyEmployeeId);
+            oaMeetingReserveRespVO.setApplyEmployeeName(employeeRespDTO.getName());
         }
         // 状态描述
         String status = oaMeetingReserve.getStatus();
@@ -137,8 +140,8 @@ public class OaMeetingReserveController {
         if (oaMeetingReserveRespVOList.size() > 0) {
             // 申请人
             List<Long> applyEmployeeIds = oaMeetingReserveRespVOList.stream().map(OaMeetingReserveRespVO::getApplyEmployeeId).collect(Collectors.toList());
-            List<AdminUserRespDTO> userList = adminUserApi.getUserList(applyEmployeeIds);
-            Map<Long, AdminUserRespDTO> userMap = userList.stream().collect(Collectors.toMap(AdminUserRespDTO::getId, Function.identity()));
+            List<EmployeeRespDTO> employeeRespDTOList = employeeApi.getEmployeeListByIds(applyEmployeeIds);
+            Map<Long, EmployeeRespDTO> employeeRespDTOMap = CollectionUtils.convertMap(employeeRespDTOList, EmployeeRespDTO::getId, Function.identity());
 
             // // 参与人
             // List<Long> participantEmployeeIds = new ArrayList<>();
@@ -171,9 +174,9 @@ public class OaMeetingReserveController {
                 // 申请人姓名
                 Long applyEmployeeId = oaMeetingReserveRespVO.getApplyEmployeeId();
                 if (applyEmployeeId != null) {
-                    AdminUserRespDTO user = userMap.get(applyEmployeeId);
-                    if (user != null) {
-                        oaMeetingReserveRespVO.setApplyEmployeeName(user.getNickname());
+                    EmployeeRespDTO employeeRespDTO = employeeRespDTOMap.get(applyEmployeeId);
+                    if (employeeRespDTO != null) {
+                        oaMeetingReserveRespVO.setApplyEmployeeName(employeeRespDTO.getName());
                     }
                 }
                 // // 参与人姓名

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserRespDTO.java

@@ -32,6 +32,18 @@ public class AdminUserRespDTO {
      * 部门ID
      */
     private Long deptId;
+    /**
+     * 部门名称
+     */
+    private String deptName;
+    /**
+     * 职位id
+     */
+    private Long postId;
+    /**
+     * 职位名称
+     */
+    private String position;
     /**
      * 岗位编号数组
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -120,6 +120,12 @@ public class AuthController {
             dto.setAvatar(employee.getAvatar());
             // 设置员工部门ID
             dto.setDeptId(employee.getDeptId());
+            // 设置员工部门名称
+            dto.setDeptName(employee.getDeptName());
+            // 设置员工职位ID
+            dto.setPostId(employee.getPostId());
+            // 设置员工职位名称
+            dto.setPosition(employee.getPosition());
             // 设置员工手机号
             dto.setMobile(employee.getPhone());
         } else {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java

@@ -47,6 +47,18 @@ public class AuthPermissionInfoRespVO {
         @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
         private Long deptId;
 
+        @Schema(description = "部门名称", example = "研发部")
+        private String deptName;
+
+        @Schema(description = "职位id", example = "1")
+        private Long postId;
+
+        @Schema(description = "职位名称", example = "董事长")
+        private String position;
+
+        @Schema(description = "手机号码", example = "15600000000")
+        private String mobile;
+
         @Schema(description = "当前租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
         private Long tenantId;