qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/230802-添加非系统人员时误删除taxagentEmp数据' into release/2.9.4.2308.02

This commit is contained in:
Harryxzy 2023-08-30 10:44:52 +08:00
parent 8966730267 bd1a6b7a9a
commit c2ae65ff79
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java
View File

@ -172,7 +172,7 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic
return;
}
List<Long> taxAgentIds = taxAgentEmpSaveParamList.stream().map(TaxAgentEmpSaveParam::getTaxAgentId).collect(Collectors.toList());
List<TaxAgentEmpPO> taxAgentEmployeeExistList = this.listByTaxAgentIds(taxAgentIds, UseEmployeeTypeEnum.ORG);
List<TaxAgentEmpPO> taxAgentEmployeeExistList = this.listByTaxAgentIds(taxAgentIds, UseEmployeeTypeEnum.EXT);
Date now = new Date();
// 关联表
List<TaxAgentEmpPO> taxAgentEmployeeAddList = Lists.newArrayList();

7
src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
View File

@ -429,6 +429,10 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
getTaxAgentExtRangeMapper().insertIgnoreNull(po);
});
List<DataCollectionEmployee> 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<DataCollectionEmployee> finalEmployees = employees;
taskExecutor.execute(() -> {
syncLocalExtEmp(taxAgentId, employees);
syncLocalExtEmp(taxAgentId, finalEmployees);
});
}
}