From d52c20ed07bcea2d848bdab25f2c49c21c00d269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 二月 2024 12:56:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
index e09038a..7a5d5f3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -259,6 +259,7 @@
   <select id="getDivides" resultType="com.dy.pipIrrGlobal.voPr.VoDivide">
     SELECT
       (@i:=@i+1) AS id,
+      CAST(divi.id AS char) AS divideId,
       divi.name AS divideName,
       blo.`name` AS blockName,
       divi.header,
@@ -282,9 +283,11 @@
       </if>
     </where>
     ORDER BY divi.operateDt DESC
-    <if test="pageCurr != null and pageSize != null">
-      LIMIT ${pageCurr}, ${pageSize}
-    </if>
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 
   <!--鏍规嵁鍒嗘按鎴縄D閫昏緫鍒犻櫎鍒嗘按鎴�-->
@@ -297,4 +300,9 @@
     </where>
   </update>
 
+  <!--鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�-->
+  <select id="getBlockIdById" resultType="java.lang.Long">
+    SELECT blockId FROM pr_divide WHERE id = ${divideId}
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0