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/HrmEmployeeSocialSecurityController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
index db54d53..28b6dbd 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
@@ -96,17 +96,18 @@
if (CollUtil.isEmpty(recordList)) {
return success(new PageResult<>(Collections.emptyList(), pageResult.getTotal()));
}
- // userId 鏄憳宸D锛屾壒閲忚幏鍙栧憳宸ヤ俊鎭�
+ // userId 鏄郴缁熻处鍙� ID锛坰ystem_users.id锛夛紝涓嶆槸鍛樺伐妗ｆ涓婚敭锛坔rm_employee.id锛夛紝
+ // 蹇呴』鐢� getEmployeeByUserId 鎸� system_users.id 鏌ュ憳宸�
Set<Long> employeeIds = recordList.stream()
.map(HrmEmployeeSocialSecurityDO::getUserId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
Map<Long, HrmEmployeeDO> employeeMap = new HashMap<>();
Set<Long> deptIds = new HashSet<>();
- 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);
if (employee.getDeptId() != null) {
deptIds.add(employee.getDeptId());
}
@@ -193,7 +194,7 @@
*/
private void fillEmployeeInfo(HrmEmployeeSocialSecurityRespVO respVO, Long userId) {
// userId 鏄憳宸D锛岄�氳繃鍛樺伐琛ㄨ幏鍙栧鍚嶅拰閮ㄩ棬
- HrmEmployeeDO employee = employeeService.getEmployee(userId);
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
if (employee != null) {
respVO.setUserName(employee.getName());
if (employee.getDeptId() != null) {
--
Gitblit v1.9.3