|
|
@@ -172,15 +172,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
}
|
|
|
wrapper.orderByDesc(User::getCreateTime);
|
|
|
Page<UserExcelVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
|
|
|
- List<UserExcelVo> userVos = new ArrayList<>();
|
|
|
for (UserExcelVo record : page.getRecords()) {
|
|
|
List<UserPlatform> userPlatforms = userPlatformService.getByUserId(record.getId());
|
|
|
record.setPlatformIds(userPlatforms.stream().map(UserPlatform::getPlatformId).collect(Collectors.toList()));
|
|
|
}
|
|
|
- Page<UserExcelVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
|
|
|
- pageVo.setTotal(page.getTotal());
|
|
|
- pageVo.setRecords(userVos);
|
|
|
- return PageInfo.PageInfo(pageVo);
|
|
|
+ return PageInfo.PageInfo(page);
|
|
|
}
|
|
|
|
|
|
@Override
|