From 5d83326d232b2bccae71c663734a68c507b413b5 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 28 Jun 2023 16:26:20 +0800
Subject: [PATCH] =?UTF-8?q?listByAcctEmployeeIdsAndSalaryItemIds=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/service/SalaryAcctResultService.java    | 2 +-
 .../salary/service/impl/SalaryAcctExcelServiceImpl.java       | 4 ++--
 .../salary/service/impl/SalaryAcctResultServiceImpl.java      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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<SalaryAcctResultPO> listByAcctEmployeeIdsAndSalaryItemIds(Collection<Long> salaryAcctEmpIds, Collection<Long> salaryItemIds);
+    List<SalaryAcctResultPO> listByAcctEmployeeIdsAndSalaryItemIds(List<Long> salaryAcctEmpIds, Collection<Long> salaryItemIds);
 
     List<Long> listAcctEmpIdByAcctEmpId(List<Long> 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<Map<String, String>> errorExcelSheets = Lists.newArrayList();
         // 解析excel
-        Set<Long> salaryAcctEmpIds = Sets.newHashSet();
+        List<Long> salaryAcctEmpIds = Lists.newArrayList();
         // excel导入了哪些薪资项目
         Set<Long> excelSalaryItemIds = Sets.newHashSet();
         List<SalaryAcctResultPO> salaryAcctResults = Lists.newArrayList();
@@ -1109,7 +1109,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
      * @param salaryAcctResults
      */
     private void handleSalaryAcctResultLog(List<SalaryAcctResultPO> salaryAcctResults) {
-        Set<Long> salaryAcctEmpIds = salaryAcctResults.stream().map(SalaryAcctResultPO::getSalaryAcctEmpId).collect(Collectors.toSet());
+        List<Long> salaryAcctEmpIds = salaryAcctResults.stream().map(SalaryAcctResultPO::getSalaryAcctEmpId).distinct().collect(Collectors.toList());
         Set<Long> salaryItemIds = salaryAcctResults.stream().map(SalaryAcctResultPO::getSalaryItemId).collect(Collectors.toSet());
         // 查询导入的薪资核算结果
         List<SalaryAcctResultPO> 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<SalaryAcctResultPO> listByAcctEmployeeIdsAndSalaryItemIds(Collection<Long> salaryAcctEmployeeIds, Collection<Long> salaryItemIds) {
+    public List<SalaryAcctResultPO> listByAcctEmployeeIdsAndSalaryItemIds(List<Long> salaryAcctEmployeeIds, Collection<Long> salaryItemIds) {
         if(CollectionUtils.isEmpty(salaryAcctEmployeeIds)){
             return Collections.emptyList();
         }