From 300cda64bc2f5ad7fb0a3c057c330ed905d12032 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 28 十一月 2024 15:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java | 10 ++++++----
1 files changed, 6 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 16d5841..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,7 +61,7 @@
}
if(this.itemTotal == 0){
- this.pageSize = 1 ;
+ this.pageSize = 10 ;
}
if(this.pageSize == null || this.pageSize <= 0){
/**
@@ -69,7 +69,7 @@
* 鏈紶鍏ュ垎椤靛弬鏁版椂锛屽彇鍏ㄩ儴璁板綍
*/
//this.pageSize = 1 ;//渚涗笅闈綔涓洪櫎鏁�
- this.pageSize = 10000 ;//渚涗笅闈綔涓洪櫎鏁�
+ this.pageSize = 10 ;//渚涗笅闈綔涓洪櫎鏁�
}
pageTotal = (int)Math.ceil((itemTotal==null?0.0D:itemTotal.doubleValue())/pageSize);
@@ -88,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