|
@@ -102,7 +102,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
|
|
|
lqw.in(CollectionUtil.isNotEmpty(bo.getFloorIds()), PtRoom::getAreaId, bo.getFloorIds())
|
|
lqw.in(CollectionUtil.isNotEmpty(bo.getFloorIds()), PtRoom::getAreaId, bo.getFloorIds())
|
|
|
.and(StringUtils.isNotBlank(bo.getRoomCode()),
|
|
.and(StringUtils.isNotBlank(bo.getRoomCode()),
|
|
|
e -> e.eq(PtRoom::getRoomCode, bo.getRoomCode()).or().eq(PtRoom::getRoomName, bo.getRoomCode()));
|
|
e -> e.eq(PtRoom::getRoomCode, bo.getRoomCode()).or().eq(PtRoom::getRoomName, bo.getRoomCode()));
|
|
|
- lqw.orderByDesc(PtRoom::getCreateTime);
|
|
|
|
|
|
|
+ lqw.orderByAsc(PtRoom::getRoomCode);
|
|
|
Page<PtRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
Page<PtRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
|
List<PtRoomVo> records = result.getRecords();
|
|
List<PtRoomVo> records = result.getRecords();
|
|
|
if (CollectionUtil.isNotEmpty(records)) {
|
|
if (CollectionUtil.isNotEmpty(records)) {
|