From f3ac2d20492c9616f8bb3f9480b0ce0cf106bffd Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期六, 17 八月 2024 09:55:21 +0800
Subject: [PATCH] 优化片区分页查询接口,分页条件不需必传

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java   |    5 ++++-
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java |    7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index d528969..a6bb146 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -94,15 +94,12 @@
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯锛�2024-08-14鏂板锛屾浛鎹㈠師鏉ョ殑鐗囧尯鍒嗛〉鏌ヨ
      *
      * @param qo
-     * @param bindingResult
+     * @param
      * @return
      */
     @GetMapping(path = "/some")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoBlock>>> getBlocks(@Valid QueryVo qo, BindingResult bindingResult) {
-        if (bindingResult != null && bindingResult.hasErrors()) {
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-        }
+    public BaseResponse<QueryResultVo<List<VoBlock>>> getBlocks(QueryVo qo) {
         try {
             return BaseResponseUtils.buildSuccess(this.sv.getBlocks(qo));
         } catch (Exception e) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 47438b6..2286f3d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -83,7 +83,7 @@
      * @return
      */
     public QueryResultVo<List<VoBlock>> getBlocks(QueryVo vo){
-        vo.setPageCurr((vo.pageCurr -1) * vo.pageSize);
+        vo.setPageCurr((vo.getPageCurr() -1) * vo.getPageSize());
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
         Long itemTotal = this.dao.getBlocksCount(params) ;
 
@@ -127,6 +127,9 @@
                     job_block.put("graphs", array_mapGraphs);
                 }
             }
+        }else {//澧炲姞鍋ュ.鎬�
+            QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
+            return rsVo ;
         }
 
         QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;

--
Gitblit v1.8.0