21

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

@@ -692,7 +692,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             HashMap<Long, ScenePlusExt> plusMap = scenePlusExtService.getByPlusIds(plusIds);
 
             for (ScenePlus scenePlus : plusList) {
-                cameraMap.merge(scenePlus.getCameraId(), plusMap.get(scenePlus.getId()).getSpace(), Long::sum);
+                if(scenePlus.getCameraId()!= null && plusMap.get(scenePlus.getId())!=null){
+                    cameraMap.merge(scenePlus.getCameraId(), plusMap.get(scenePlus.getId()).getSpace(), Long::sum);
+                }
             }
             scenePlusService.removeByIds(plusIds);
         }