From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。"

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
index ceaa58f..41344a3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
@@ -61,10 +61,15 @@
         }
 
         if(this.itemTotal == 0){
-            this.pageSize = 1 ;
+            this.pageSize = 10 ;
         }
         if(this.pageSize == null || this.pageSize <= 0){
-            this.pageSize = 1 ;//渚涗笅闈綔涓洪櫎鏁�
+            /**
+             * 鏈卞疂姘� 2024-01-30 淇敼
+             * 鏈紶鍏ュ垎椤靛弬鏁版椂锛屽彇鍏ㄩ儴璁板綍
+             */
+            //this.pageSize = 1 ;//渚涗笅闈綔涓洪櫎鏁�
+            this.pageSize = 10 ;//渚涗笅闈綔涓洪櫎鏁�
         }
 
         pageTotal = (int)Math.ceil((itemTotal==null?0.0D:itemTotal.doubleValue())/pageSize);
@@ -83,8 +88,10 @@
         this.queryStart = (this.pageCurr - 1) * this.pageSize ;
         this.queryCount = this.pageSize ;
 
-        params.put("start", this.queryStart) ;
-        params.put("count", this.queryCount) ;
+        if(params != null){
+            params.put("start", this.queryStart) ;
+            params.put("count", this.queryCount) ;
+        }
     }
 
 }

--
Gitblit v1.8.0