From bd1a6b7a9afb9443d79926c18f623923ac7d7d9d Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 28 Aug 2023 22:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?= =?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BA=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E8=AF=AF=E5=88=A0=E9=99=A4=E6=AD=A3=E5=B8=B8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=8C=83=E5=9B=B4=E5=9C=A8hrsa=5Ftax=5Fagent=5Femp?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/TaxAgentEmpServiceImpl.java | 2 +- .../service/impl/TaxAgentManageRangeServiceImpl.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java index cc2d23985..7cd9cfd6f 100644 --- a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java @@ -172,7 +172,7 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic return; } List taxAgentIds = taxAgentEmpSaveParamList.stream().map(TaxAgentEmpSaveParam::getTaxAgentId).collect(Collectors.toList()); - List taxAgentEmployeeExistList = this.listByTaxAgentIds(taxAgentIds, UseEmployeeTypeEnum.ORG); + List taxAgentEmployeeExistList = this.listByTaxAgentIds(taxAgentIds, UseEmployeeTypeEnum.EXT); Date now = new Date(); // 关联表 List taxAgentEmployeeAddList = Lists.newArrayList(); diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 06cdeb04f..4486790f7 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -429,6 +429,10 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM getTaxAgentExtRangeMapper().insertIgnoreNull(po); }); + List oldEmpList = getExtEmpService(user).getEmployeeByIds(oldIds); + employees.addAll(oldEmpList); + // 去重 + employees = employees.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(e -> e.getEmployeeId()))), ArrayList::new)); /* 同步本地人员范围的关联人员=========================== */ @@ -436,8 +440,9 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM //同步执行 syncLocalExtEmp(taxAgentId, employees); } else { + List finalEmployees = employees; taskExecutor.execute(() -> { - syncLocalExtEmp(taxAgentId, employees); + syncLocalExtEmp(taxAgentId, finalEmployees); }); } }