| | |
|---|
| | | if (CollUtil.isEmpty(recordList)) { |
|---|
| | | return success(new PageResult<>(Collections.emptyList(), pageResult.getTotal())); |
|---|
| | | } |
|---|
| | | // userId 是员工ID，批量获取员工信息 |
|---|
| | | // userId 是系统账号 ID（system_users.id），不是员工档案主键（hrm_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()); |
|---|
| | | } |
|---|
| | |
|---|
| | | */ |
|---|
| | | private void fillEmployeeInfo(HrmEmployeeSocialSecurityRespVO respVO, Long userId) { |
|---|
| | | // userId 是员工ID，通过员工表获取姓名和部门 |
|---|
| | | HrmEmployeeDO employee = employeeService.getEmployee(userId); |
|---|
| | | HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId); |
|---|
| | | if (employee != null) { |
|---|
| | | respVO.setUserName(employee.getName()); |
|---|
| | | if (employee.getDeptId() != null) { |
|---|
