From 8d2b573ced32e6ca6fab7c1dc45e1fa108030ba1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 28 八月 2024 17:21:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
index ed8e8be..69d6b32 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
@@ -51,19 +51,8 @@
Long itemTotal = prDivideMapper.getRecordCount(params);
QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ;
-
- Integer pageCurr = 0;
- Integer pageSize = 10000;
- rsVo.pageCurr = 1;
- rsVo.pageSize = 10000;
- if(queryVo.pageSize != null && queryVo.pageCurr != null) {
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr;
- pageSize = queryVo.pageSize ;
- pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
- }
- params.put("pageCurr", pageCurr);
- params.put("pageSize", pageSize);
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = prDivideMapper.getDivides(params);
@@ -115,7 +104,8 @@
* @return 淇敼璁板綍鏉℃暟
*/
public Integer updateByPrimaryKey(PrDivide po) {
- return prDivideMapper.updateByPrimaryKey(po);
+ //return prDivideMapper.updateByPrimaryKey(po);
+ return prDivideMapper.updateByPrimaryKeySelective(po);
}
/**
--
Gitblit v1.8.0