From ff7b1047bcccfd2a07b9f4b643623c4731bf88d2 Mon Sep 17 00:00:00 2001 From: fcli Date: Mon, 5 Dec 2022 14:06:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E6=94=BE=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalarySendServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 5c2062651..6bcf22390 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -674,7 +674,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService ids = getSalarySendRangeService(user) .getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds(), SalarySendGrantTypeEnum.GRANT); if (ids.isEmpty()) {// 由于查出来是空的，会导致全部发放，在此进行拦截 - throw new SalaryRunTimeException("工资发放范围内没有员工"); + throw new SalaryRunTimeException("工资发放范围内没有匹配员工"); } } @@ -939,6 +939,14 @@ public class SalarySendServiceImpl extends Service implements SalarySendService //如果传了范围id，则使用范围id撤回 ids = getSalarySendRangeService(user) .getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds(), SalarySendGrantTypeEnum.WITHDRAW); + if (param.getSalarySendRangeIds() != null) { + //如果传了范围id，则使用范围id发放 + ids = getSalarySendRangeService(user) + .getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds(), SalarySendGrantTypeEnum.GRANT); + if (ids.isEmpty()) {// 由于查出来是空的，会导致全部发放，在此进行拦截 + throw new SalaryRunTimeException("工资撤回范围内没有匹配的员工"); + } + } } SalarySendPO salarySend = mapper.getById(salarySendId);