From 58214df7901e2a57799d9b6bee897aa634165e69 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期三, 04 十一月 2026 13:35:19 +0800
Subject: [PATCH] fix(hrm): 考勤汇总 yearMonth 字段加反引号，修复列表 500
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
index ebb1fdd..b2d742b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
@@ -140,15 +140,17 @@
*/
private void fillUserInfo(List<HrmSalaryPaymentDetailRespVO> respList, List<HrmSalaryPaymentDetailDO> detailList) {
// 鎵归噺鑾峰彇鍛樺伐淇℃伅
- Set<Long> employeeIds = detailList.stream()
+ // 娉ㄦ剰锛氬彂鏀炬槑缁嗙殑 userId 瀛樼殑鏄�岀郴缁熻处鍙� ID銆嶏紙system_users.id锛夛紝
+ // 涓嶆槸鍛樺伐妗ｆ涓婚敭锛坔rm_employee.id锛夛紝蹇呴』鐢� getEmployeeByUserId 鏌�
+ Set<Long> userIds = detailList.stream()
.map(HrmSalaryPaymentDetailDO::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 : userIds) {
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
if (employee != null) {
- employeeMap.put(employeeId, employee);
+ employeeMap.put(userId, employee);
}
}
// 鎵归噺鑾峰彇閮ㄩ棬淇℃伅
--
Gitblit v1.9.3