1

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

@@ -108,12 +108,6 @@ 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();
@@ -139,8 +133,15 @@ public class SceneService implements ISceneService {
             }
             param.setSnCodes(snCodes);
         }
+
         if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
-            param.setSnCodes( Arrays.asList("no_snCode"));
+            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));
+            }else {
+                param.setSnCodes( Arrays.asList("no_snCode"));
+            }
         }
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;