From ffec90c897e9bd78e88b9fa590a5dd75d26b82c8 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 11:38:23 +0800
Subject: [PATCH] fix(hrm): 修复员工导入失败（日期格式 + 部门/岗位/角色不存在）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
index a684c8a..295fe25 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
@@ -62,16 +62,16 @@
* 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭�
*/
private void fillUserInfo(List<HrmAttendanceSummaryRespVO> respList, List<HrmAttendanceSummaryDO> summaryList) {
- // 鎵归噺鑾峰彇鍛樺伐淇℃伅
+ // 鎵归噺鑾峰彇鍛樺伐淇℃伅锛坲serId 鏄郴缁熻处鍙� ID锛岄渶鎸� getEmployeeByUserId 鏌ワ級
Set<Long> employeeIds = summaryList.stream()
.map(HrmAttendanceSummaryDO::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);
}
}
// 鎵归噺鑾峰彇閮ㄩ棬淇℃伅
@@ -105,8 +105,8 @@
return success(null);
}
HrmAttendanceSummaryRespVO respVO = BeanUtils.toBean(summary, HrmAttendanceSummaryRespVO.class);
- // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭�
- HrmEmployeeDO employee = employeeService.getEmployee(userId);
+ // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄郴缁熻处鍙� ID锛屼笉鏄憳宸ユ。妗� ID锛�
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
if (employee != null) {
respVO.setUserName(employee.getName());
}
--
Gitblit v1.9.3