1

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -129,7 +130,22 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         sceneCooperationService.deleteCooperationList(sceneProList,scenePlusList);
         fdkkLaserService.disableCooperation(detailMap, cameraMap);
         //解绑删除相机。文件夹与场景绑定关系
-        folderSceneService.delByCameraIds(cameraIds);
+        List<Long > sceneIds = new ArrayList<>();
+        if(sceneProList.size() >0){
+            List<Long> proIds = sceneProList.stream().map(ScenePro::getId).collect(Collectors.toList());
+            if(proIds.size() >0){
+                sceneIds.addAll(proIds);
+            }
+        }
+        if(scenePlusList.size() >0){
+            List<Long> plusIds = scenePlusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
+            if(plusIds.size() >0){
+                sceneIds.addAll(plusIds);
+            }
+        }
+        if(sceneIds.size() >0){
+            folderSceneService.delBySceneId(sceneIds);
+        }
     }
 
     @Override