|
@@ -83,6 +83,8 @@ public class ImLiveBroadcastRoomMemberServiceImpl extends ServiceImpl<ImLiveBroa
|
|
|
HttpResponseResult<List<RoomMember>> listHttpResponseResult = klxFeignService.queryRoomMember(param);
|
|
|
List<RoomMember> roomMembers = listHttpResponseResult.getData();
|
|
|
List<ImLiveBroadcastRoomMemberVo> records;
|
|
|
+ long pages = pageInfo.getPages();
|
|
|
+ long rows = pageInfo.getSize();
|
|
|
if (CollectionUtils.isNotEmpty(roomMembers)) {
|
|
|
|
|
|
//roomMembers 转 ImLiveBroadcastRoomMemberVo
|
|
@@ -183,9 +185,11 @@ public class ImLiveBroadcastRoomMemberServiceImpl extends ServiceImpl<ImLiveBroa
|
|
|
.parseArray(JSON.toJSONString(roomMembers),ImLiveBroadcastRoomMemberVo.class);
|
|
|
records.addAll(imLiveBroadcastRoomMemberVos);
|
|
|
records.sort(Comparator.comparing(ImLiveBroadcastRoomMemberVo::getJoinTime));
|
|
|
- long pages = page.getPages();
|
|
|
- long rows = page.getSize();
|
|
|
- List<ImLiveBroadcastRoomMemberVo> imLiveBroadcastRoomMemberVos1 = records.subList((int) (((pages-1)>=0?(pages-1):0) * rows), (int) rows);
|
|
|
+
|
|
|
+ page.setPages(pages);
|
|
|
+ page.setSize(rows);
|
|
|
+ page.setTotal(records.size());
|
|
|
+ List<ImLiveBroadcastRoomMemberVo> imLiveBroadcastRoomMemberVos1 = records.subList((int) (((pages-1)>=0?(pages-1):0) * rows), (int) (rows>records.size()?records.size():rows));
|
|
|
page.setRecords(imLiveBroadcastRoomMemberVos1);
|
|
|
} else {
|
|
|
page = baseMapper.queryMemberPage(pageInfo, param);
|