diff --git a/src/com/engine/salary/service/SalaryAcctResultService.java b/src/com/engine/salary/service/SalaryAcctResultService.java index b15cf93bd..20b9ad2f8 100644 --- a/src/com/engine/salary/service/SalaryAcctResultService.java +++ b/src/com/engine/salary/service/SalaryAcctResultService.java @@ -197,7 +197,7 @@ public interface SalaryAcctResultService { * @author Harryxzy * @date 2022/12/26 22:24 */ - List listByAcctEmployeeIdsAndSalaryItemIds(Collection salaryAcctEmpIds, Collection salaryItemIds); + List listByAcctEmployeeIdsAndSalaryItemIds(List salaryAcctEmpIds, Collection salaryItemIds); List listAcctEmpIdByAcctEmpId(List salaryAcctEmployeeIds); diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 6801cb415..6cba27124 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -768,7 +768,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 包含错误提示信息的sheet页 List> errorExcelSheets = Lists.newArrayList(); // 解析excel - Set salaryAcctEmpIds = Sets.newHashSet(); + List salaryAcctEmpIds = Lists.newArrayList(); // excel导入了哪些薪资项目 Set excelSalaryItemIds = Sets.newHashSet(); List salaryAcctResults = Lists.newArrayList(); @@ -1109,7 +1109,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc * @param salaryAcctResults */ private void handleSalaryAcctResultLog(List salaryAcctResults) { - Set salaryAcctEmpIds = salaryAcctResults.stream().map(SalaryAcctResultPO::getSalaryAcctEmpId).collect(Collectors.toSet()); + List salaryAcctEmpIds = salaryAcctResults.stream().map(SalaryAcctResultPO::getSalaryAcctEmpId).distinct().collect(Collectors.toList()); Set salaryItemIds = salaryAcctResults.stream().map(SalaryAcctResultPO::getSalaryItemId).collect(Collectors.toSet()); // 查询导入的薪资核算结果 List salaryAcctResultList = getSalaryAcctResultService(user).listByAcctEmployeeIdsAndSalaryItemIds(salaryAcctEmpIds, salaryItemIds); diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 555738118..0fbcf6ee6 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -974,7 +974,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } @Override - public List listByAcctEmployeeIdsAndSalaryItemIds(Collection salaryAcctEmployeeIds, Collection salaryItemIds) { + public List listByAcctEmployeeIdsAndSalaryItemIds(List salaryAcctEmployeeIds, Collection salaryItemIds) { if(CollectionUtils.isEmpty(salaryAcctEmployeeIds)){ return Collections.emptyList(); }