From c70945a73ffa521339a4fe4f43e308cae2fb63b8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 14:06:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/UserMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 7ae6eba..90ede01 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -100,8 +100,8 @@
FROM t_user
<where>
and deleted=0
- <if test="userName != null and userName != ''">
- and user_name like concat('%',#{userName},'%')
+ <if test="realName != null and realName != ''">
+ and real_name like concat('%',#{realName},'%')
</if>
<if test="role != null ">
and role= #{role}
@@ -135,6 +135,9 @@
<set>
<if test="realName != null">real_name = #{realName},</if>
<if test="age != null">age = #{age},</if>
+ <if test="sex != null">sex = #{sex},</if>
+ <if test="phone != null and phone !='' ">phone = #{phone},</if>
+ <if test="birthDay != null ">birth_day = #{birthDay},</if>
<if test="lastActiveTime != null">last_active_time = #{lastActiveTime},</if>
</set>
where id = #{id}
--
Gitblit v1.8.0