lyhzzz před 11 měsíci
rodič
revize
621ddb9689

+ 9 - 0
src/main/java/com/fdkankan/fusion/common/PageInfo.java

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

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

@@ -129,7 +129,7 @@ public class SceneService implements ISceneService {
             param.setSnCodes(snCodes);
             param.setSnCodes(snCodes);
         }
         }
         if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
         if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
-            param.setSnCodes( Arrays.asList("no_snCode"));
+            return PageInfo.PageInfoEmpty();
         }
         }
         List<SceneVo> sceneVoList = new ArrayList<>();
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;
         long total = 0;