diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 88e8de324..54f91e235 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -222,6 +222,12 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct return getSalaryAcctEmployeeMapper().list(queryParam); } + public List listByParam4jh(SalaryAcctEmployeeQueryParam queryParam) { + List salaryAcctEmployeePOList = getSalaryAcctEmployeeMapper().listPage4jh(queryParam); + salaryAcctEmployeePOList = salaryAcctEmployeePOList.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getSalarySobId)).collect(Collectors.toList()); + return salaryAcctEmployeePOList; + } + @Override public PageInfo listPageByResultQueryParam(SalaryAcctResultQueryParam queryParam) { ValidUtil.doValidator(queryParam); @@ -248,7 +254,11 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct if (StringUtils.isNotEmpty(queryParam.getConsolidatedTaxation())) { salaryAcctEmployeePOS = listByParam4ConsolidatedTax(salaryAcctEmployeeQueryParam); } else { - salaryAcctEmployeePOS = listByParam(salaryAcctEmployeeQueryParam); + if (CollectionUtils.isNotEmpty(queryParam.getSalaryAcctRecordIds())) { + salaryAcctEmployeePOS = listByParam4jh(salaryAcctEmployeeQueryParam); + } else { + salaryAcctEmployeePOS = listByParam(salaryAcctEmployeeQueryParam); + } } return salaryAcctEmployeePOS; }