Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

修复社保福利台账线下对比和核算人数不匹配问题
2025-04-24 17:50:17 +08:00 · 2025-04-24 17:48:54 +08:00
1 changed files with 2 additions and 1 deletions
--- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
@ -172,7 +172,8 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar
        List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
        List<Long> canAccountIds = baseInfoPOList.stream()
                .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
-                        && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
+                        && !f.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())
+                )
                .map(InsuranceArchivesBaseInfoPO::getEmployeeId)
                .collect(Collectors.toList());
        accountExportPOS = accountExportPOS.stream().filter(v -> canAccountIds.contains(v.getEmployeeId())).collect(Collectors.toList());
Author	SHA1	Message	Date
Harryxzy	344571997f	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2025-04-24 17:50:17 +08:00
Harryxzy	25c8479d53	修复社保福利台账线下对比和核算人数不匹配问题	2025-04-24 17:48:54 +08:00