|
@@ -225,7 +225,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
|
wrapper.orderByDesc(Company::getId);
|
|
|
Page<Company> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
|
|
|
- for (Company entity : page.getRecords()) {
|
|
|
+ List<ResponseCompany> list = page.getRecords().stream().map(entity->{
|
|
|
ResponseCompany company = new ResponseCompany();
|
|
|
BeanUtils.copyProperties(entity,company);
|
|
|
if(entity.getManagerId() != null){
|
|
@@ -236,8 +236,12 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
|
|
|
}
|
|
|
}
|
|
|
company.setSceneNum(0);
|
|
|
- }
|
|
|
- return PageInfo.PageInfo(page);
|
|
|
+ return company;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ Page<ResponseCompany> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
|
|
|
+ pageVo.setRecords(list);
|
|
|
+ pageVo.setTotal(page.getTotal());
|
|
|
+ return PageInfo.PageInfo(pageVo);
|
|
|
}
|
|
|
|
|
|
@Override
|