From f070c479a77ba91845f679839f75940d79c13896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89=E4=B8=9C?=
 <129883742+liyudong2018@users.noreply.github.com>
Date: Sat, 20 Sep 2025 15:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/hivekion/room/bean/Room.java                 | 2 ++
 .../hivekion/statistic/service/impl/ScenarioServiceImpl.java   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/hivekion/room/bean/Room.java b/src/main/java/com/hivekion/room/bean/Room.java
index fd665a2..e01bbd6 100644
--- a/src/main/java/com/hivekion/room/bean/Room.java
+++ b/src/main/java/com/hivekion/room/bean/Room.java
@@ -225,6 +225,7 @@ public class Room implements AutoCloseable {
     scenario.setResourceList(SpringUtil.getBean(ScenarioResourceServiceImpl.class).getResourceListByScenarioId(scenario.getId()));
     for(ScenarioResource scenarioResource:this.scenario.getResourceList() ){
       ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo(scenarioResource.getScenarioId(),roomId,scenarioResource.getId());
+
       if( redisUtil == null){
         redisUtil = SpringUtil.getBean(RedisUtil.class);
         redisUtil.hset(scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId(),"scenarioInfo", JSON.toJSONString(scenarioInfo));
@@ -233,6 +234,7 @@ public class Room implements AutoCloseable {
       }
     }
 
+
   }
 
 
diff --git a/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java b/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
index 0f129a9..77feb37 100644
--- a/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
+++ b/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
@@ -62,6 +62,9 @@ public class ScenarioServiceImpl implements ScenarioService {
         }
         //获取物资信息
         List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList);
+        if(suppliers==null){
+          return  new  ScenarioInfo();
+        }
         Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
 
         suppliers.forEach(supplier -> {