|
@@ -83,11 +83,13 @@ public class WorkerStockLogic {
|
|
|
.groupBy(WebsitUser::getUserId)
|
|
|
.list();
|
|
|
List<String> userIds = workerList.stream().map(WebsitUser::getUserId).collect(Collectors.toList());
|
|
|
- final List<User> userList = userService.lambdaQuery()
|
|
|
- .in(User::getUserId, userIds)
|
|
|
- .groupBy(User::getIdCard)
|
|
|
- .list();
|
|
|
- workers = userList.stream().map(User::getIdCard).collect(Collectors.toList());
|
|
|
+ if (CollectionUtil.isNotEmpty(userIds)) {
|
|
|
+ final List<User> userList = userService.lambdaQuery()
|
|
|
+ .in(User::getUserId, userIds)
|
|
|
+ .groupBy(User::getIdCard)
|
|
|
+ .list();
|
|
|
+ workers = userList.stream().map(User::getIdCard).collect(Collectors.toList());
|
|
|
+ }
|
|
|
}
|
|
|
IPage<WorkerStockVO> page = commonMapper.workerStockList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, workers);
|
|
|
return page;
|