diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 0c382e98..bd1825c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -145,12 +145,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - where u.del_flag = '0' and r.role_id = #{roleId} + where u.del_flag = '0' and r.role_id = #{user.roleId} - AND u.user_name like concat('%', #{userName}, '%') + AND u.user_name like concat('%', #{user.userName}, '%') - AND u.phonenumber like concat('%', #{phonenumber}, '%') + AND u.phonenumber like concat('%', #{user.phonenumber}, '%') @@ -160,13 +160,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) - and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) + where u.del_flag = '0' and (r.role_id != #{user.roleId} or r.role_id IS NULL) + and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{user.roleId}) - AND u.user_name like concat('%', #{userName}, '%') + AND u.user_name like concat('%', #{user.userName}, '%') - AND u.phonenumber like concat('%', #{phonenumber}, '%') + AND u.phonenumber like concat('%', #{user.phonenumber}, '%')