全宗名称

src/main/java/com/fdkankan/fusion/common/PageInfo.java

@@ -6,6 +6,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -30,6 +31,14 @@ public class PageInfo<T> {
             .list(page.getRecords())
             .build();
     }
+    public static PageInfo PageInfoEmpty(){
+        return PageInfo.builder()
+                .pageNum(1)
+                .pageSize(10)
+                .total(0)
+                .list(new ArrayList<>())
+                .build();
+    }
     public static PageInfo PageInfo(Long currentPage, Long pageSize, Long total, List<?> list){
         return PageInfo.builder()
             .pageNum(currentPage)

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

@@ -135,12 +135,12 @@ public class SceneService implements ISceneService {
         }
 
         if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
-            if(StpUtil.hasRole("admin-super")){
+            if(StpUtil.hasRole("admin-super")&& StringUtils.isBlank(param.getSnCode())){
                 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"));
+                return PageInfo.PageInfoEmpty();
             }
         }
         List<SceneVo> sceneVoList = new ArrayList<>();