lyhzzz 1 year ago
parent
commit
9480631929
1 changed files with 6 additions and 3 deletions
  1. 6 3
      src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

+ 6 - 3
src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -95,9 +95,6 @@ public class SceneService implements ISceneService {
                 param.setSnCodes(snCodes);
             }
         }
-        if(StringUtils.isBlank(param.getDeptId())){
-            param.setDeptId("0");
-        }
         if(StringUtils.isNotBlank(param.getDeptId())){
             List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
             List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
@@ -111,6 +108,12 @@ public class SceneService implements ISceneService {
                 snCodes = snCodes.stream().filter(snCodeSet::contains).collect(Collectors.toList());
             }
             param.setSnCodes(snCodes);
+        }else {
+            if(StpUtil.hasRole("admin-super")){
+                List<TmCamera> tmCameras = tmCameraService.list();
+                Set<String> snCodeSet = tmCameras.parallelStream().map(TmCamera::getCameraSn).collect(Collectors.toSet());
+                param.setSnCodes(new ArrayList<>(snCodeSet));
+            }
         }
         if(StringUtils.isNotBlank(param.getSnCode())){
             List<String> snCodes = param.getSnCodes();