From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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..363e953 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);

--
Gitblit v1.8.0