From 28b284b06d3e27c3219508657084f1f5e22c0f88 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 02 八月 2024 11:42:48 +0800
Subject: [PATCH] 修改分页查询设置 不传值默认返回第一页,一页十条

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java |   25 +++++++++++++++++++++++--
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml                 |    2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
index 62a857a..7bfbf5e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
@@ -15,13 +15,34 @@
      */
     @Schema(description = "褰撳墠椤�", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "褰撳墠椤典笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    public Integer pageCurr ;
+    public Integer pageCurr;
 
     /**
      * 姣忛〉鏁版嵁鏉℃暟
      */
     @Schema(description = "姣忛〉璁板綍鏁�", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "姣忛〉璁板綍鏁颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    public Integer pageSize ;
+    public Integer pageSize;
 
+    /**
+     * 璁剧疆褰撳墠榛樿绗竴椤�
+     * @return
+     */
+    public Integer getPageCurr() {
+        if (pageCurr == null){
+            return 1;
+        }
+        return pageCurr;
+    }
+
+    /**
+     * 璁剧疆褰撳墠榛樿涓�椤靛崄鏉�
+     * @return
+     */
+    public Integer getPageSize() {
+        if (pageSize == null){
+            return 10;
+        }
+        return pageSize;
+    }
 }
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index fc10859..3fd34ef 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
 
 pipIrr:
     global:
-        dev: false   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: true   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     mw:
         webPort: 8070

--
Gitblit v1.8.0