Merge branch 'feature-v4.11.0-20231024-dsx' into test

src/main/java/com/fdkankan/scene/service/impl/SurveillanceServiceImpl.java

@@ -98,12 +98,18 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
+
+        Surveillance surveillance = this.getBySid(param.getNum(), param.getSid());
+        if(Objects.isNull(surveillance)){
+            return ResultData.ok("sid不存在");
+        }
+
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByScenePlusId(scenePlus.getId());
         String bucket = scenePlusExt.getYunFileBucket();
 
-        Surveillance surveillance = this.getBySid(param.getNum(), param.getSid());
+
 
         this.remove(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getSid, param.getSid()));