1

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

@@ -287,9 +287,9 @@ public class SceneCommonService {
         CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
 
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail,cameraType);
-        if(!checkSpace && location != 7){
+        if(!checkSpace && (location == null || location != 7)){
             List<String> panoNumList = new ArrayList<>();
-            if(location != null && location == 7){
+            if(cameraDetail.getCompanyId()!= null && cameraDetail.getCompanyId() == 26L){
                 panoNumList.add(scenePlus.getNum());
             }
             sceneProService.lockOrUnLockScenes(new ArrayList<>(), Arrays.asList(newNum),-2,cameraType.getIsLaser(),panoNumList);