From 07292531db6d5fb1bf0de5c2416147fcf812c7bc Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 19 Dec 2022 18:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=9B=9E=E7=AE=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 49c2bda55..65f42def6 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -373,7 +373,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService .sendStatus(SalarySendStatusEnum.ALREADYSEND.getValue()) .salaryAcctType(NumberUtils.INTEGER_ZERO).build(); List salarySendInfos = getSalarySendInfoMapper().listSome(sendInfo); - if (salarySend.getSendNum() > 0 || CollectionUtils.isNotEmpty(salarySendInfos)) { + if ( (salarySend.getSendNum() > 0 || CollectionUtils.isNotEmpty(salarySendInfos)) && Objects.equals(salarySend.getSalaryAcctType(), NumberUtils.INTEGER_ONE) ) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100507, "补发工资单已经发放，不可进行回算")); + }else if (salarySend.getSendNum() > 0 || CollectionUtils.isNotEmpty(salarySendInfos)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100507, "工资单已经发放，不可撤销,可以进行回算")); } // 删除工资单