优化参数clone

hs-web · Jul 30, 2021 · 52bfe02 · 52bfe02
1 parent ed5e3b0
commit 52bfe02
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/...eb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/QueryParamEntity.java b/...eb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/QueryParamEntity.java
@@ -128,7 +128,7 @@ public <T> Query<T, QueryParamEntity> toQuery() {
      * <p>
      * 执行后条件: (name=? or type=?) and userId=?
      *
-     * @see this#toNestQuery(Consumer)
+     * @see QueryParamEntity#toNestQuery(Consumer)
      * @since 3.0.4
      */
     public <T> Query<T, QueryParamEntity> toNestQuery() {

diff --git a/...b-commons-crud/src/main/java/org/hswebframework/web/crud/service/ReactiveCrudService.java b/...b-commons-crud/src/main/java/org/hswebframework/web/crud/service/ReactiveCrudService.java
@@ -207,14 +207,14 @@ default <T> Mono<PagerResult<T>> queryPager(QueryParamEntity query, Function<E,
         if (query.isParallelPager()) {
             return Mono
                     .zip(
-                            createQuery().setParam(query).count(),
+                            createQuery().setParam(query.clone()).count(),
                             createQuery().setParam(query.clone()).fetch().map(mapper).collectList(),
                             (total, data) -> PagerResult.of(total, data, query)
                     );
         }
         return getRepository()
                 .createQuery()
-                .setParam(query)
+                .setParam(query.clone())
                 .count()
                 .flatMap(total -> {
                     if (total == 0) {

diff --git a/...ons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/web/QueryController.java b/...ons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/web/QueryController.java
@@ -113,7 +113,7 @@ default PagerResult<E> queryPager(@Parameter(hidden = true) QueryParamEntity que
                                 .fetch(), query)
                     ;
         }
-        int total = getRepository().createQuery().setParam(query).count();
+        int total = getRepository().createQuery().setParam(query.clone()).count();
         if (total == 0) {
             return PagerResult.of(0, Collections.emptyList(), query);
         }

diff --git a/...eb-commons-crud/src/main/java/org/hswebframework/web/crud/web/ServiceQueryController.java b/...eb-commons-crud/src/main/java/org/hswebframework/web/crud/web/ServiceQueryController.java
@@ -111,7 +111,7 @@ default PagerResult<E> queryPager(@Parameter(hidden = true) QueryParamEntity que
                                 .fetch(), query)
                     ;
         }
-        int total = getService().createQuery().setParam(query).count();
+        int total = getService().createQuery().setParam(query.clone()).count();
         if (total == 0) {
             return PagerResult.of(0, Collections.emptyList(), query);
         }

diff --git a/...-crud/src/main/java/org/hswebframework/web/crud/web/reactive/ReactiveQueryController.java b/...-crud/src/main/java/org/hswebframework/web/crud/web/reactive/ReactiveQueryController.java
@@ -44,7 +44,7 @@ public interface ReactiveQueryController<E, K> {
     @QueryAction
     @QueryOperation(summary = "使用GET方式分页动态查询(不返回总数)",
             description = "此操作不返回分页总数,如果需要获取全部数据,请设置参数paging=false")
-    default Flux<E> query(@Parameter(hidden = true)  QueryParamEntity query) {
+    default Flux<E> query(@Parameter(hidden = true) QueryParamEntity query) {
         return getRepository()
                 .createQuery()
                 .setParam(query)
@@ -109,11 +109,12 @@ default Mono<PagerResult<E>> queryPager(@Parameter(hidden = true) QueryParamEnti
                     .map(list -> PagerResult.of(query.getTotal(), list, query));
         }
 
-        return Mono.zip(
-                getRepository().createQuery().setParam(query).count(),
-                query(query.clone()).collectList(),
-                (total, data) -> PagerResult.of(total, data, query)
-        );
+        return Mono
+                .zip(
+                        getRepository().createQuery().setParam(query.clone()).count(),
+                        query(query.clone()).collectList(),
+                        (total, data) -> PagerResult.of(total, data, query)
+                );
 
     }