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

处理报表空指针

This commit is contained in:
钱涛 2024-11-26 18:14:41 +08:00
parent 5d458356a5
commit b652dbbc8b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
// 根据关键词过滤 // 根据关键词过滤
if (StringUtils.isNotBlank(queryParam.getKeyword())) { if (StringUtils.isNotBlank(queryParam.getKeyword())) {
employeeList = employeeList.stream() employeeList = employeeList.stream()
.filter(e -> (e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getWorkcode()) && e.getWorkcode().contains(queryParam.getKeyword())))) .filter(e -> (StringUtils.isNotEmpty(e.getUsername()) && e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getWorkcode()) && e.getWorkcode().contains(queryParam.getKeyword()))))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList()); List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());