From 286cc58be63c13a90f59eaf02879f6954ff9b142 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期三, 04 十一月 2026 13:21:39 +0800
Subject: [PATCH] fix(hrm): 修复社保/考勤列表员工姓名、部门全空（ID 口径混用）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 1ee8810..3308b5e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -119,16 +119,16 @@
* 娉ㄦ剰锛氳�冨嫟璁板綍鐨� userId 鏄憳宸D锛屼笉鏄郴缁熺敤鎴稩D
*/
private void fillUserInfo(List<HrmAttendanceRecordRespVO> respList, List<HrmAttendanceRecordDO> recordList) {
- // 鎵归噺鑾峰彇鍛樺伐淇℃伅锛坲serId 鏄憳宸D锛�
+ // 鎵归噺鑾峰彇鍛樺伐淇℃伅锛坲serId 鏄郴缁熻处鍙� 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);
}
}
// 鎵归噺鑾峰彇閮ㄩ棬淇℃伅
--
Gitblit v1.9.3