From 5e9956fbbf5f35a8884f7c018b962c1f3fe5675b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 26 Jan 2024 14:56:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A8=A1=E6=9D=BFid=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=97=B6=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E4=BA=86=E5=85=B6=E4=BB=96=E6=A8=A1=E6=9D=BF=E7=9A=84?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E7=9A=84=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryTemplateServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 03df3c980..444a799d8 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -363,10 +363,14 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate public List getSalaryItemSetContainHide(Long salarySobId, Long salaryTemplateId, boolean isReplenish) { SalarySobItemAggregateDTO salarySobItemAggregate = getSalarySobItemService(user).getAggregateBySalarySobId(salarySobId); // 获取工资单薪资项目展示名信息 - List billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType( - SalaryBillItemNamePO.builder().salaryTemplateId(salaryTemplateId) - .salaryBillType(isReplenish ? 1 : 0) - .build()); + List billItemNameList = Collections.emptyList(); + if (salaryTemplateId != null) { + billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType( + SalaryBillItemNamePO.builder().salaryTemplateId(salaryTemplateId) + .salaryBillType(isReplenish ? 1 : 0) + .build()); + } + Map itemShowNameMap = SalaryEntityUtil.convert2Map(billItemNameList, SalaryBillItemNamePO::getSalaryItemId, SalaryBillItemNamePO::getSalaryItemShowName); List salaryTemplateSalaryItemSetListDTOS = SalaryTemplateBO.convertSalarySobItemAggregateToSalaryItemSet(salarySobItemAggregate, new Long(user.getUID()), isReplenish);