From 2ed55123b99cb5e4f0395a07ccde5652856ed643 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 19 八月 2024 20:40:01 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
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