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/salary/HrmSalaryCalculationController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index 8604682..e55d7de 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -90,16 +90,18 @@
* 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄憳宸D锛�
*/
private void fillUserInfo(List<HrmSalaryCalculationRespVO> respList, List<HrmSalaryCalculationDO> calculationList) {
- // userId 鏄憳宸D锛屾壒閲忚幏鍙栧憳宸ヤ俊鎭�
- Set<Long> employeeIds = calculationList.stream()
+ // 娉ㄦ剰锛氭牳绠楄褰曠殑 userId 瀛樼殑鏄�岀郴缁熻处鍙� ID銆嶏紙system_users.id锛夛紝
+ // 涓嶆槸鍛樺伐妗ｆ涓婚敭锛坔rm_employee.id锛夈�傜敤 getEmployee 浼氭案杩滄煡涓嶅埌锛�
+ // 瀵艰嚧鍒楄〃閲屻�屽憳宸ュ鍚嶃�嶄竴鍒楀叏绌恒�傚繀椤荤敤 getEmployeeByUserId銆�
+ Set<Long> userIds = calculationList.stream()
.map(HrmSalaryCalculationDO::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);
}
}
@@ -133,9 +135,11 @@
return success(null);
}
HrmSalaryCalculationRespVO respVO = BeanUtils.toBean(salaryCalculation, HrmSalaryCalculationRespVO.class);
- // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄憳宸D锛�
+ // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭�
+ // 娉ㄦ剰锛氭牳绠楄褰曠殑 userId 瀛樼殑鏄�岀郴缁熻处鍙� ID銆嶏紙system_users.id锛夛紝
+ // 涓嶆槸鍛樺伐妗ｆ涓婚敭锛坔rm_employee.id锛夛紝蹇呴』鐢� getEmployeeByUserId 鏌�
if (salaryCalculation.getUserId() != null) {
- HrmEmployeeDO employee = employeeService.getEmployee(salaryCalculation.getUserId());
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(salaryCalculation.getUserId());
if (employee != null) {
respVO.setUserName(employee.getName());
}
--
Gitblit v1.9.3