|
@@ -124,12 +124,13 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
|
|
|
}
|
|
|
if(param.getRoomStatus() != null){
|
|
|
if( param.getRoomStatus() == 0){
|
|
|
- wrapper.in(Room::getRoomStatus,0,1);
|
|
|
+ wrapper.in(Room::getRoomStatus,0,1,2);
|
|
|
+ wrapper.orderByAsc(Room::getRoomStatus);
|
|
|
}else {
|
|
|
wrapper.eq(Room::getRoomStatus,param.getRoomStatus());
|
|
|
}
|
|
|
}
|
|
|
- wrapper.orderByDesc(Room::getCreateTime);
|
|
|
+ wrapper.orderByDesc(Room::getUpdateTime);
|
|
|
|
|
|
Page<Room> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
for (Room record : page.getRecords()) {
|