From 6f346cec0b4646bdf750781075e46a4f028cd35b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 16 八月 2024 15:25:17 +0800
Subject: [PATCH] 分水房、控制器、用户、角色、总账 返回结果修改

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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 26a5dc4..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
@@ -47,14 +47,12 @@
     public QueryResultVo<List<VoDivide>> getDivides(QueryVo queryVo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
 
+        // 璁$畻绗﹀悎鏉′欢鐨勮褰曟暟
         Long itemTotal = prDivideMapper.getRecordCount(params);
 
         QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ;
         rsVo.pageSize = queryVo.pageSize ;
-        //rsVo.pageCurr = queryVo.pageCurr ;
-        Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
-        params.put("pageCurr", pageCurr);
-        rsVo.pageCurr = pageCurr;
+        rsVo.pageCurr = queryVo.pageCurr ;
 
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = prDivideMapper.getDivides(params);
@@ -106,6 +104,16 @@
      * @return 淇敼璁板綍鏉℃暟
      */
     public Integer updateByPrimaryKey(PrDivide po) {
-        return prDivideMapper.updateByPrimaryKey(po);
+        //return prDivideMapper.updateByPrimaryKey(po);
+        return prDivideMapper.updateByPrimaryKeySelective(po);
+    }
+
+    /**
+     * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�
+     * @param divideId 鍒嗘按鎴縄D
+     * @return 鎵�灞炵墖鍖篒D
+     */
+    public Long getBlockIdById(Long divideId) {
+        return prDivideMapper.getBlockIdById(divideId);
     }
 }

--
Gitblit v1.8.0