|  | @@ -172,7 +172,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
 | 
											
												
													
														|  |          IPage<LiveRoom> page = this.page(pageInfo, Wrappers.<LiveRoom>lambdaQuery()
 |  |          IPage<LiveRoom> page = this.page(pageInfo, Wrappers.<LiveRoom>lambdaQuery()
 | 
											
												
													
														|  |                  .eq(WrapperUtil.StrPredicate.test(roomType), LiveRoom::getType, roomType)
 |  |                  .eq(WrapperUtil.StrPredicate.test(roomType), LiveRoom::getType, roomType)
 | 
											
												
													
														|  |                  .eq(WrapperUtil.ObjPredicate.test(liveState), LiveRoom::getLiveState, liveState)
 |  |                  .eq(WrapperUtil.ObjPredicate.test(liveState), LiveRoom::getLiveState, liveState)
 | 
											
												
													
														|  | -                .eq(LiveRoom::getRoomState, 0)
 |  | 
 | 
											
												
													
														|  | 
 |  | +                .in(LiveRoom::getRoomState, 0,2)
 | 
											
												
													
														|  |                  .eq(LiveRoom::getSpeakerId, userId)
 |  |                  .eq(LiveRoom::getSpeakerId, userId)
 | 
											
												
													
														|  |          );
 |  |          );
 | 
											
												
													
														|  |          return PageUtil.pageInfo(page);
 |  |          return PageUtil.pageInfo(page);
 |