qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01

This commit is contained in:
Harryxzy 2024-11-11 14:06:37 +08:00
parent 95abadfb0d 553764da86
commit 6ebef0cd5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
View File

@ -340,11 +340,11 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(emp -> queryParam.getIds().contains(emp.getId())).collect(Collectors.toList());
}
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getSalaryMonth).reversed()).collect(Collectors.toList());
PageInfo<SalaryAcctEmployeePO> SalaryAcctEmployeePageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), salaryAcctEmployeeList);
PageInfo<SalaryAcctEmployeePO> salaryAcctEmployeePageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), salaryAcctEmployeeList);
if (queryParam.isExport()) {
SalaryAcctEmployeePageInfo.setList(salaryAcctEmployeeList);
salaryAcctEmployeePageInfo.setList(salaryAcctEmployeeList);
}
return SalaryAcctEmployeePageInfo;
return salaryAcctEmployeePageInfo;
}
@Override