| | |
| | | */ |
| | | private void fillUserInfo(List<HrmSalaryPaymentDetailRespVO> respList, List<HrmSalaryPaymentDetailDO> detailList) { |
| | | // 批量获取员工信息 |
| | | Set<Long> employeeIds = detailList.stream() |
| | | // 注意:发放明细的 userId 存的是「系统账号 ID」(system_users.id), |
| | | // 不是员工档案主键(hrm_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); |
| | | } |
| | | } |
| | | // 批量获取部门信息 |