核算界面获取外部人员

This commit is contained in:
钱涛 2023-07-13 14:11:32 +08:00
parent 888938f150
commit 4901f79066
2 changed files with 11 additions and 3 deletions

View File

@ -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);
}

View File

@ -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