From 8c6a9e192d5516684275d755fc55d78ae35ddfa7 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 3 Jan 2024 15:38:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=AF=E6=B9=BEfix=E6=97=A0=E6=A1=A3?= =?UTF-8?q?=E6=A1=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/SalaryAcctExcelServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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)));