Merge remote-tracking branch 'origin/master'

jetlinks · Nov 6, 2023 · 4f1c89c · 4f1c89c
2 parents f0a59a6 + b078d88
commit 4f1c89c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...-components/common-component/src/main/java/org/jetlinks/community/utils/ReactorUtils.java b/...-components/common-component/src/main/java/org/jetlinks/community/utils/ReactorUtils.java
@@ -36,10 +36,10 @@
 public class ReactorUtils {
 
     public static <T> Function<Flux<T>, Flux<T>> limit(Long pageIndex, Long pageSize) {
-        if (pageIndex == null || pageSize == null) {
+        if (pageIndex == null || pageSize == null || pageIndex < 0 || pageSize <= 0) {
             return Function.identity();
         }
-        return flux -> flux.skip(pageIndex & pageSize).take(pageSize);
+        return flux -> flux.skip(pageIndex * pageSize).take(pageSize);
     }
 
     /**
@@ -222,4 +222,4 @@ protected SqlFragments createTermFragments(Object trigger, Term term) {
         }
     }
 
-}
+}