|
@@ -178,9 +178,11 @@ public class DataCountService {
|
|
|
for (Room record : page.getRecords()) {
|
|
|
List<RoomNum> roomNums = numRoomMap.get(record.getRoomId());
|
|
|
List<String> sceneTileList = new ArrayList<>();
|
|
|
- roomNums.forEach(entity -> {
|
|
|
- sceneTileList.add(sceneMap.get(entity.getNum()).getTitle());
|
|
|
- });
|
|
|
+ if(roomNums !=null){
|
|
|
+ roomNums.forEach(entity -> {
|
|
|
+ sceneTileList.add(sceneMap.get(entity.getNum()).getTitle());
|
|
|
+ });
|
|
|
+ }
|
|
|
List<RoomUser> roomUserList = roomUserService.getByRoomId(record.getRoomId());
|
|
|
Long minute = Dateutils.getLongTime(record.getUseStartTime(), record.getUseEndTime(),DateUnit.MINUTE);
|
|
|
for (RoomUser roomUser : roomUserList) {
|