tuqin
6 天以前 ffec90c897e9bd78e88b9fa590a5dd75d26b82c8
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -119,16 +119,16 @@
     * 注意:考勤记录的 userId 是员工ID,不是系统用户ID
     */
    private void fillUserInfo(List<HrmAttendanceRecordRespVO> respList, List<HrmAttendanceRecordDO> recordList) {
        // 批量获取员工信息(userId 是员工ID)
        // 批量获取员工信息(userId 是系统账号 ID,需按 getEmployeeByUserId 查)
        Set<Long> employeeIds = recordList.stream()
                .map(HrmAttendanceRecordDO::getUserId)
                .filter(Objects::nonNull)
                .collect(Collectors.toSet());
        Map<Long, HrmEmployeeDO> employeeMap = new HashMap<>();
        for (Long employeeId : employeeIds) {
            HrmEmployeeDO employee = employeeService.getEmployee(employeeId);
        for (Long userId : employeeIds) {
            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
            if (employee != null) {
                employeeMap.put(employeeId, employee);
                employeeMap.put(userId, employee);
            }
        }
        // 批量获取部门信息
@@ -164,9 +164,9 @@
            return success(null);
        }
        HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(attendanceRecord, HrmAttendanceRecordRespVO.class);
        // 填充员工和部门信息(userId 是员工ID)
        // 填充员工和部门信息(userId 是系统账号 ID,不是员工档案 ID)
        if (attendanceRecord.getUserId() != null) {
            HrmEmployeeDO employee = employeeService.getEmployee(attendanceRecord.getUserId());
            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(attendanceRecord.getUserId());
            if (employee != null) {
                respVO.setUserName(employee.getName());
                respVO.setPhone(employee.getPhone());