diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index fa749a61a..0e2c2ade6 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -1665,6 +1665,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc return pltxEmployeeDTO.builder().build(); } List salaryArchivePOS = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().employeeId(Long.valueOf(param.getXm())).taxAgentId(taxAgentPOList.get(0).getId()).build()); + if (CollectionUtils.isEmpty(salaryArchivePOS)) { + return pltxEmployeeDTO.builder().build(); + } BaseBean baseBean = new BaseBean(); String salaryItemId = baseBean.getPropValue("shgwSalary", "pltxSalaryItemId"); List salaryArchiveItemList = getSalaryArchiveService(user).getCurrentEffectiveItemList(salaryArchivePOS.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()), Collections.singletonList(Long.valueOf(salaryItemId)));