Merge branch 'test'

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

@@ -87,7 +87,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
     @Override
     public Long getSpaceSumByCameraId(Long cameraId) {
-        return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
+        Long spaceSumByCameraId = this.getBaseMapper().getSpaceSumByCameraId(cameraId);
+        return spaceSumByCameraId == null ?0:spaceSumByCameraId;
     }
 
     @Override

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

@@ -948,7 +948,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public Long getSpaceSumByCameraId(Long cameraId) {
-        return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
+        Long spaceSumByCameraId = this.getBaseMapper().getSpaceSumByCameraId(cameraId);
+        return spaceSumByCameraId == null ? 0:spaceSumByCameraId;
     }
 
     @Override