fix(hrm): 调岗列表申请人姓名兼容 user_id 双口径(历史数据存员工主键)
已修改1个文件
18 ■■■■■ 文件已修改
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -289,6 +289,16 @@
                .filter(Objects::nonNull)
                .collect(Collectors.toSet());
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
        // 兜底:历史数据里 user_id 可能存的是「员工主键」而不是 system_users.id,查不到用户时按员工档案补姓名
        Map<Long, String> employeeNameMap = new HashMap<>();
        for (Long userId : userIds) {
            if (!userMap.containsKey(userId)) {
                HrmEmployeeDO employee = employeeService.getEmployee(userId);
                if (employee != null) {
                    employeeNameMap.put(userId, employee.getName());
                }
            }
        }
        Set<Long> deptIds = pageResult.getList().stream()
                .flatMap(app -> Stream.of(app.getCurrentDeptId(), app.getTargetDeptId()))
                .filter(Objects::nonNull)
@@ -301,8 +311,12 @@
        Map<Long, PostRespDTO> postMap = postApi.getPostMap(postIds);
        List<HrmTransferApplicationRespVO> list = pageResult.getList().stream().map(app -> {
            HrmTransferApplicationRespVO vo = BeanUtils.toBean(app, HrmTransferApplicationRespVO.class);
            if (app.getUserId() != null && userMap.containsKey(app.getUserId())) {
                vo.setUserName(userMap.get(app.getUserId()).getNickname());
            if (app.getUserId() != null) {
                if (userMap.containsKey(app.getUserId())) {
                    vo.setUserName(userMap.get(app.getUserId()).getNickname());
                } else if (employeeNameMap.containsKey(app.getUserId())) {
                    vo.setUserName(employeeNameMap.get(app.getUserId()));
                }
            }
            if (app.getCurrentDeptId() != null && deptMap.containsKey(app.getCurrentDeptId())) {
                vo.setCurrentDeptName(deptMap.get(app.getCurrentDeptId()).getName());