From e246b9a9051178f5a579f2a0c1c204040cf07d23 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 4 Aug 2025 20:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E5=85=89=E7=94=B5=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/SIAccountServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 4fe4309ae..37f93be40 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -7220,13 +7220,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List archivedTaxAgentIds = new ArrayList<>(); for (TaxAgentPO taxAgentPO : taxAgentPOS) { InsuranceAccountBatchPO batchPO = getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), taxAgentPO.getId()); - if (batchPO != null && batchPO.getBillStatus().equals(BillStatusEnum.ARCHIVED.getValue())) { + if (batchPO != null) { archivedTaxAgentIds.add(taxAgentPO.getId()); } } if (CollectionUtils.isEmpty(archivedTaxAgentIds)) { - throw new SalaryRunTimeException("暂无已归档数据"); + throw new SalaryRunTimeException("暂无数据"); } // 获取台账明细数据 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); @@ -7410,13 +7410,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List archivedTaxAgentIds = new ArrayList<>(); for (TaxAgentPO taxAgentPO : taxAgentPOS) { InsuranceAccountBatchPO batchPO = getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), taxAgentPO.getId()); - if (batchPO != null && batchPO.getBillStatus().equals(BillStatusEnum.ARCHIVED.getValue())) { + if (batchPO != null) { archivedTaxAgentIds.add(taxAgentPO.getId()); } } if (CollectionUtils.isEmpty(archivedTaxAgentIds)) { - throw new SalaryRunTimeException("暂无已归档数据"); + throw new SalaryRunTimeException("暂无数据"); } // 获取台账明细数据 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();