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 extEmpPOS = getExternalEmployeeMapper().listSome(ExtEmpPO.builder().ids(ids).build()); - + List extEmpPOS = new ArrayList<>(); + List> 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 getEmployeeByIdsAll(List ids) { - return employBiz.getEmployeeByIdsAll(ids); + if (CollectionUtils.isEmpty(ids)) { + return new ArrayList<>(); + } + List employeeList = employBiz.getEmployeeByIdsAll(ids); + if (openExtEmp) { + employeeList.addAll(getExtEmpService(user).getEmployeeByIds(ids)); + } + return employeeList; } @Override