|
@@ -57,6 +57,15 @@ public class SettledCompanyDynamicsServiceImpl extends ServiceImpl<SettledCompan
|
|
// 查询总数
|
|
// 查询总数
|
|
Integer dataCount = baseMapper.getCountByCondition(pageView);
|
|
Integer dataCount = baseMapper.getCountByCondition(pageView);
|
|
List<SettledCompanyDynamics> dataList = baseMapper.getListByCondition(pageView);
|
|
List<SettledCompanyDynamics> dataList = baseMapper.getListByCondition(pageView);
|
|
|
|
+ if (!CollectionUtils.isEmpty(dataList)){
|
|
|
|
+ for (SettledCompanyDynamics settledCompanyDynamics1:dataList){
|
|
|
|
+ CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("phone", settledCompanyDynamics1.getPhone()));
|
|
|
|
+ if (commonUser!=null){
|
|
|
|
+ //昵称
|
|
|
|
+ settledCompanyDynamics1.setUserName(commonUser.getUserName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
Page<SettledCompanyDynamics> page = new Page<>();
|
|
Page<SettledCompanyDynamics> page = new Page<>();
|
|
page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
|
|
page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
|
|
page.setTotal(dataCount == null ? 0 : dataCount);
|
|
page.setTotal(dataCount == null ? 0 : dataCount);
|