From 31a863c937bd694be69e1cf2d8b49cee8754e452 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 19 Jul 2023 11:51:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index f6b149e70..7e5d5a944 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -664,6 +664,8 @@ public class SalarySendServiceImpl extends Service implements SalarySendService if (ObjectUtils.isEmpty(salarySendPO)) throw new SalaryRunTimeException("工资单不存在或已被删除"); List salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId())); + if(CollectionUtils.isEmpty(salaryTemplates)) + throw new SalaryRunTimeException("请先设置工资单模板"); Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus(); if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) { // 默认为空时，未读未确认 From 311aa8f139744e403ee53970aa5bf2183f54f46b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 19 Jul 2023 16:17:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=A4=A7=E6=8B=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalarySendServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 7e5d5a944..6f01b9fe0 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -475,8 +475,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService SalarySendInfoPO salarySendInfo = salarySendInfos.get(0); // 获取默认模板信息 SalarySendPO salarySendPO = getSalarySendMapper().getById(salarySendInfo.getSalarySendId()); - if(ObjectUtils.isEmpty(salarySendPO)) + if(ObjectUtils.isEmpty(salarySendPO)){ throw new SalaryRunTimeException("工资单不存在"); + } // 更新查看状态 if (salarySendInfo.getBillReadStatus() == null || NumberUtils.compare(salarySendInfo.getBillReadStatus(),BillReadStatusEnum.UNREAD.getValue()) == 0) { salarySendInfo.setBillReadStatus(BillReadStatusEnum.READED.getValue()); @@ -661,11 +662,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), page, SalarySendInfoListDTO.class); SalarySendPO salarySendPO = getSalarySendMapper().getById(queryParam.getSalarySendId()); - if (ObjectUtils.isEmpty(salarySendPO)) + if (ObjectUtils.isEmpty(salarySendPO)){ throw new SalaryRunTimeException("工资单不存在或已被删除"); + } List salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId())); - if(CollectionUtils.isEmpty(salaryTemplates)) + if(CollectionUtils.isEmpty(salaryTemplates)){ throw new SalaryRunTimeException("请先设置工资单模板"); + } Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus(); if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) { // 默认为空时，未读未确认