1

src/main/java/com/fdkankan/manage/controller/OverallController.java

@@ -146,6 +146,7 @@ public class OverallController {
                 User user = userMap.get(userId);
                 obj.put("userName",user==null?null :user.getUserName());
             }
+            obj.put("isColdStorage",false);
             if(coldStorageMap != null){
                 SceneColdStorage sceneColdStorage = coldStorageMap.get(num);
                 if(sceneColdStorage != null){

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -667,9 +667,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(num);
         }
-        if(sceneSource ==3){
-            overallService.delete(num);
-        }
+        overallService.delete(num);
         if(cameraId != null){
             cameraDetailService.initSpace(cameraId);
             this.lockOrUnLockBySpace(cameraId);