Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -84,6 +84,9 @@ public class XfTermServiceImpl implements IXfTermService {
                 List<PtRoomVo> ptRoomVos = roomService.queryRoomByAreaId(Long.parseLong(roomId1.toString()));
                 if(CollectionUtil.isNotEmpty(ptRoomVos)){
                     roomIds.addAll(ptRoomVos.stream().map(PtRoomVo::getRoomId).toList());
+                }else{
+                    // 没有房间id 则不用查询了
+                    return TableDataInfo.build(new Page<>());
                 }
             }else {
                 roomIds.add(Long.valueOf(roomId1.toString()));