sdfdsfsdfsdfdsfsd

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

@@ -1089,7 +1089,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for (ScenePlus scenePlus : plusList) {
             ScenePlusExt ext = plusMap.get(scenePlus.getId());
             if(ext == null || scenePlus.getSceneStatus() !=-2 ||
-                    (cameraDetail.getCompanyId()!=null && cameraDetail.getCompanyId() == 26L && ext.getLocation() ==7)){
+                    (cameraDetail.getCompanyId()!=null && cameraDetail.getCompanyId() == 26L && ext.getLocation() != null && ext.getLocation() ==7)){
                 continue;
             }
             SimpleSceneVo sceneVo = new SimpleSceneVo();