From 42f5453644c41d3b6ac9e381f931efdfc9da8178 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 27 五月 2024 16:09:56 +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 |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 ccf499f..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 !=''">

--
Gitblit v1.8.0