1

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

@@ -89,6 +89,9 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
 
     @Override
     public void bind(List<Long> cameraIds, Integer companyId,Long userId) {
+        if(cameraIds == null || cameraIds.isEmpty()){
+            return;
+        }
         LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
         wrapper.in(CameraDetail::getCameraId,cameraIds);
         wrapper.set(CameraDetail::getCompanyId,companyId);

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

@@ -171,7 +171,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }else {
                 List<ManageFolderScene> byFolderId = manageFolderSceneService.getType(param.getType());
                 List<String> collect = byFolderId.stream().map(ManageFolderScene::getNum).collect(Collectors.toList());
-                param.setFolderNoInNums(collect);
+                if(param.getCooperateSceneCodes() != null && !param.getCooperateSceneCodes().isEmpty()){
+                    List<String> collect1 = collect.stream().filter(e -> !param.getCooperateSceneCodes().contains(e)).collect(Collectors.toList());
+                    param.setFolderNoInNums(collect1);
+                }else {
+                    param.setFolderNoInNums(collect);
+                }
             }
         }
         if(param.getType() != null &&( param.getType() == 2 || param.getType() == 5 || param.getType() == 57)){
@@ -307,6 +312,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void deleteByNum(String num) {
+
         ScenePro scenePro = this.getByNum(num);
         if(scenePro!=null){
             this.removeById(scenePro.getId());
@@ -318,6 +324,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             scenePlusExtService.delByPlus(scenePlus.getId());
             this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),"I");
         }
+        if(scenePro == null && scenePlus == null){
+            return;
+        }
         Integer sceneSource = scenePro == null ? scenePlus.getSceneSource() : scenePro.getSceneSource();
         if(sceneSource == 4 || sceneSource == 5){
             laserService.updateStatus(num,-1);

src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -186,6 +186,10 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             projectNumService.delNumList(null,param.getNumList());
         }
 
+        if(param.getFolderIdList() != null && !param.getFolderIdList().isEmpty()){
+            manageFolderService.removeByIds(param.getFolderIdList());
+        }
+
     }
 
 

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -72,7 +72,7 @@
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>
         <if test="param.isLaserScene ==0 and param.sceneName != null and param.sceneName!='' ">
-            and s.scene_name like concat ('%',#{param.sceneName},'%')
+            and s.title like concat ('%',#{param.sceneName},'%')
         </if>
         <if test="param.isLaserScene ==1 and param.sceneName != null and param.sceneName!='' ">
             and s.laser_title like concat ('%',#{param.sceneName},'%')