房间使用情况查询

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -144,6 +144,10 @@ public class WebGatewayImpl implements WebGateway {
         // 换为目标DTO
         List<DeviceDTO> deviceDTOList = CopyUtils.copyList(devInfoPage.getRecords(), DeviceDTO.class);
 
+        if (CollectionUtils.isEmpty(deviceDTOList)) {
+            return CopyUtils.copyPage(devInfoPage, deviceDTOList);
+        }
+
         //收集所有tenantId
         Set<Long> tenantIds = deviceDTOList.stream()
                 .map(DeviceDTO::getTenantId)

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/StayTimeServiceImpl.java

@@ -61,7 +61,7 @@ public class StayTimeServiceImpl extends ServiceImpl<StayTimeMapper, StayTime> i
             queryWrapper.lt(StayTime::getLeaveTime, req.getEndDate().plusDays(1));
         }
 
-        queryWrapper.orderByDesc(StayTime::getCreateTime);
+        queryWrapper.orderByDesc(StayTime::getLeaveTime);
         return this.baseMapper.selectList(queryWrapper);
     }
 }