1

src/main/java/com/fdkankan/manage_jp/service/IManageFolderSceneService.java

@@ -25,5 +25,5 @@ public interface IManageFolderSceneService extends IService<ManageFolderScene> {
 
     void delByNumList(List<String> numList, Integer type);
 
-    List<ManageFolderScene> getType(Integer type);
+    List<ManageFolderScene> getType(Long companyId,Integer type);
 }

src/main/java/com/fdkankan/manage_jp/service/IManageFolderService.java

@@ -26,4 +26,6 @@ public interface IManageFolderService extends IService<ManageFolder> {
     void moveScene(ManageFolderSceneVo param);
 
     void checkFolderName(Integer id,String name, Integer parentId,Integer type);
+
+    List<ManageFolder> getByCompanyId(Long companyId, Integer type);
 }

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

@@ -34,7 +34,18 @@ public class ManageFolderSceneServiceImpl extends ServiceImpl<IManageFolderScene
     }
 
     @Override
-    public List<ManageFolderScene> getType(Integer type) {
+    public List<ManageFolderScene> getType(Long companyId,Integer type) {
+        if(companyId != null){
+            List<ManageFolder> manageFolders = manageFolderService.getByCompanyId(companyId,type);
+            List<Integer> folderIds = manageFolders.stream().map(ManageFolder::getId).collect(Collectors.toList());
+            if(folderIds == null || folderIds.isEmpty()){
+                return new ArrayList<>();
+            }
+            LambdaQueryWrapper<ManageFolderScene> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(ManageFolderScene::getFolderId,folderIds);
+            return this.list(wrapper);
+        }
+
         LambdaQueryWrapper<ManageFolderScene> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ManageFolderScene::getType,type);
         return this.list(wrapper);

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

@@ -166,4 +166,12 @@ public class ManageFolderServiceImpl extends ServiceImpl<IManageFolderMapper, Ma
             }
         }
     }
+
+    @Override
+    public List<ManageFolder> getByCompanyId(Long companyId, Integer type) {
+        LambdaQueryWrapper<ManageFolder > wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ManageFolder::getCompanyId,companyId);
+        wrapper.eq(ManageFolder::getType,type);
+        return this.list(wrapper);
+    }
 }

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

@@ -169,9 +169,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
                 param.setFolderInNums(collect);
             }else {
-                List<ManageFolderScene> byFolderId = manageFolderSceneService.getType(param.getType());
+                List<ManageFolderScene> byFolderId = manageFolderSceneService.getType(param.getCompanyId(),param.getType());
                 List<String> collect = byFolderId.stream().map(ManageFolderScene::getNum).collect(Collectors.toList());
-                if(param.getCooperateSceneCodes() != null && !param.getCooperateSceneCodes().isEmpty()){
+                if(!roleIds.contains(5L) && param.getCooperateSceneCodes() != null && !param.getCooperateSceneCodes().isEmpty()){
                     List<String> collect1 = collect.stream().filter(e -> !param.getCooperateSceneCodes().contains(e)).collect(Collectors.toList());
                     param.setFolderNoInNums(collect1);
                 }else {