|
@@ -77,21 +77,21 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
|
|
|
if (StringUtils.isNotBlank(param.getRoomTitle()) ) {
|
|
|
wrapper.like(Room::getRoomTitle,param.getRoomTitle());
|
|
|
}
|
|
|
- wrapper.orderByDesc(Room::getLastLookTime);
|
|
|
+ //wrapper.orderByDesc(Room::getLastLookTime);
|
|
|
wrapper.orderByDesc(Room::getCreateTime);
|
|
|
|
|
|
Page<Room> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
- List<Room> closeRoomList = new ArrayList<>();
|
|
|
- List<Room> openRoomList = new ArrayList<>();
|
|
|
- for (Room record : page.getRecords()) {
|
|
|
- if(record.getRoomStatus() == 2){
|
|
|
- closeRoomList.add(record);
|
|
|
- }else {
|
|
|
- openRoomList.add(record);
|
|
|
- }
|
|
|
- }
|
|
|
- openRoomList.addAll(closeRoomList);
|
|
|
- page.setRecords(openRoomList);
|
|
|
+// List<Room> closeRoomList = new ArrayList<>();
|
|
|
+// List<Room> openRoomList = new ArrayList<>();
|
|
|
+// for (Room record : page.getRecords()) {
|
|
|
+// if(record.getRoomStatus() == 2){
|
|
|
+// closeRoomList.add(record);
|
|
|
+// }else {
|
|
|
+// openRoomList.add(record);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// openRoomList.addAll(closeRoomList);
|
|
|
+// page.setRecords(openRoomList);
|
|
|
return PageInfo.PageInfo(page);
|
|
|
}
|
|
|
|