1

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

@@ -82,9 +82,6 @@ public class SceneService implements ISceneService {
         if(StringUtils.isNotBlank(tokenValue)){
             tmCameraList = tmCameraService.getByDeptIds();
             List<String> snCodes = tmCameraList.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());
-            if(CollectionUtil.isEmpty(snCodes) && CollectionUtil.isEmpty(param.getNumList())){
-                snCodes = Arrays.asList("no_snCode");
-            }
             if(CollectionUtil.isNotEmpty(snCodes)){
                 param.setSnCodes(snCodes);
             }
@@ -111,6 +108,9 @@ public class SceneService implements ISceneService {
             }
             param.setSnCodes(snCodes);
         }
+        if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
+            param.setSnCodes( Arrays.asList("no_snCode"));
+        }
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;
         if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4){      //看看，看见 ,深时obj