1

src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -200,10 +200,12 @@ public class AppCameraService {
             Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId(),false);
             Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId(), false);
             sapce = proCount + pulsCount;
-            ScenePro scenePro = sceneProService.getByUnicode(unicode);
-            ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);
-            if(scenePro != null || scenePlusExt !=null){
-                return new AppCameraSpace(1L,cameraDetail.getUnit());
+            if(StringUtils.isNotBlank(unicode)){
+                ScenePro scenePro = sceneProService.getByUnicode(unicode);
+                ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);
+                if(scenePro != null || scenePlusExt !=null){
+                    return new AppCameraSpace(1L,cameraDetail.getUnit());
+                }
             }
         }
         Long totalSpace = cameraDetailService.getTotalSpaceByCameraId(cameraDetail);