lyhzzz 2 年之前
父節點
當前提交
ed76210ab0
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/main/java/com/fdkankan/tk/service/DataCountService.java

+ 5 - 3
src/main/java/com/fdkankan/tk/service/DataCountService.java

@@ -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) {