ws

src/main/java/com/fdkankan/fusion/request/ScenePram.java

@@ -21,6 +21,8 @@ public class ScenePram extends RequestBase {
 
     private String share;
 
+    private Integer searchType = 0;  //0 场景管理列表，1案件添加场景列表
+
     public String getSceneName() {
         return sceneName== null ?null :sceneName.trim();
     }

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -88,8 +88,11 @@ public class SceneService implements ISceneService {
             }
         }
         if(StringUtils.isNotBlank(param.getDeptId())){
-            List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
-            List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
+            List<String> deptIds = new ArrayList<>();
+            if(param.getSearchType() == 0){
+                List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
+                deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
+            }
             deptIds.add(param.getDeptId());
             List<TmCamera> tmCameras = tmCameraService.getByDeptIds(deptIds);
             Set<String> snCodeSet = tmCameras.parallelStream().map(TmCamera::getCameraSn).collect(Collectors.toSet());