From 4901f79066793fce3fdca753b01a8dfada4a04e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 13 Jul 2023 14:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E7=95=8C=E9=9D=A2=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=A4=96=E9=83=A8=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/ExtEmpServiceImpl.java    | 5 +++--
 .../salary/service/impl/SalaryEmployeeServiceImpl.java   | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
index 19068bdda..8db902160 100644
--- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
+++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
@@ -103,8 +103,9 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
         if (CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
-        List<ExtEmpPO> extEmpPOS = getExternalEmployeeMapper().listSome(ExtEmpPO.builder().ids(ids).build());
-
+        List<ExtEmpPO> extEmpPOS = new ArrayList<>();
+        List<List<Long>> partition = Lists.partition(ids, 500);
+        partition.forEach(list ->extEmpPOS.addAll(getExternalEmployeeMapper().listSome(ExtEmpPO.builder().ids(list).build())) );
         return coverList(extEmpPOS);
 
     }
diff --git a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
index 35ab6fb5b..d4cbdb8bf 100644
--- a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
@@ -141,7 +141,14 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
 
     @Override
     public List<DataCollectionEmployee> getEmployeeByIdsAll(List<Long> ids) {
-        return employBiz.getEmployeeByIdsAll(ids);
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        List<DataCollectionEmployee> employeeList = employBiz.getEmployeeByIdsAll(ids);
+        if (openExtEmp) {
+            employeeList.addAll(getExtEmpService(user).getEmployeeByIds(ids));
+        }
+        return employeeList;
     }
 
     @Override