From 3b574875cb5f4e1eab24bfedbeff4cd3c2b19ea5 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 10 十一月 2021 10:07:28 +0800 Subject: [PATCH] update hutool 5.7.15 => 5.7.16 update okhttp 4.9.1 => 4.9.2 update spring-boot-admin 2.5.2 => 2.5.3 update redisson 3.16.3 => 3.16.4 update tlog 1.3.3 => 1.3.4 --- ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 63fdaa0..5d9a185 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -86,6 +86,9 @@ sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' + <if test="user.userId != null and user.userId != 0"> + AND u.user_id = #{user.userId} + </if> <if test="user.userName != null and user.userName != ''"> AND u.user_name like concat('%', #{user.userName}, '%') </if> @@ -186,12 +189,12 @@ <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> <include refid="selectUserVo"/> - where u.user_name = #{userName} + where u.del_flag = '0' and u.user_name = #{userName} </select> <select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> <include refid="selectUserVo"/> - where u.user_id = #{userId} + where u.del_flag = '0' and u.user_id = #{userId} </select> -- Gitblit v1.9.3