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