From a60332d51fec0ae9f1afecc8c7a018c77e4ac101 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 27 二月 2024 10:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 00deab6..f99beee 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -271,8 +271,8 @@
             AND user.supperAdmin != 1
             AND user.deleted = 0
 
-            <if test = "name != null and name !=''">
-                AND user.name like CONCAT('%',#{name},'%')
+            <if test = "userName != null and userName !=''">
+                AND user.name like CONCAT('%',#{userName},'%')
             </if>
 
             <if test = "phone != null and phone !=''">
@@ -304,8 +304,8 @@
             AND user.supperAdmin != 1
             AND user.deleted = 0
 
-            <if test = "name != null and name !=''">
-                AND user.name like CONCAT('%',#{name},'%')
+            <if test = "userName != null and userName !=''">
+                AND user.name like CONCAT('%',#{userName},'%')
             </if>
 
             <if test = "phone != null and phone !=''">
@@ -317,9 +317,11 @@
             </if>
         </where>
         ORDER BY user.id 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>
 
     <!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇瑙掕壊ID鍒楄〃-->

--
Gitblit v1.8.0