|
|
@@ -5,6 +5,7 @@ import com.fs.common.core.domain.R;
|
|
|
import com.fs.common.core.redis.RedisCache;
|
|
|
import com.fs.common.utils.DateUtils;
|
|
|
import com.fs.common.utils.spring.SpringUtils;
|
|
|
+import com.github.pagehelper.PageInfo;
|
|
|
import com.fs.company.domain.Company;
|
|
|
import com.fs.company.domain.CompanyUser;
|
|
|
import com.fs.company.mapper.CompanyMapper;
|
|
|
@@ -588,7 +589,8 @@ public class LiveDataServiceImpl implements ILiveDataService {
|
|
|
@Override
|
|
|
public R getLiveUserDetailListBySql(Long liveId, Long companyId, Long companyUserId ) {
|
|
|
List<LiveUserDetailVo> userDetailList = liveDataMapper.selectLiveUserDetailListBySql(liveId, companyId, companyUserId);
|
|
|
- return R.ok().put("data", userDetailList);
|
|
|
+ PageInfo<LiveUserDetailVo> pageInfo = new PageInfo<>(userDetailList);
|
|
|
+ return R.ok().put("rows", pageInfo.getList()).put("total", pageInfo.getTotal());
|
|
|
}
|
|
|
|
|
|
@Override
|