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();