zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改用户登录根据名称查询角色返回不完整问题

Browse Source
This commit is contained in:
chenshaohua
2026-07-13 19:42:16 +08:00
parent be0b687ee3
commit bf49838c22
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@@ -46,6 +46,14 @@ public interface SysUserMapper
*/
public SysUser selectUserByUserName(String userName);
/**
* 通过用户名查询用户
*
* @param userName 用户名
* @return 用户对象信息
*/
public SysUser selectUserByUserNameNew(String userName);
/**
* 通过用户ID查询用户
*

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -115,7 +115,8 @@ public class SysUserServiceImpl implements ISysUserService
@Override
public SysUser selectUserByUserName(String userName)
{
return userMapper.selectUserByUserName(userName);
//return userMapper.selectUserByUserName(userName);
return userMapper.selectUserByUserNameNew(userName);
}
/**

23
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="appUserId" column="app_user_id" />
<result property="lcUserid" column="lc_userid" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
<!--<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />-->
<collection property="roles" javaType="java.util.List" column="user_id" select="selectRolesByUserId"/>
</resultMap>
<resultMap id="deptResult" type="SysDept">
@@ -245,4 +246,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1
</select>
<sql id="selectUserVoNew">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,u.id_card,u.app_user_id,u.lc_userid
from sys_user u left join sys_dept d on u.dept_id = d.dept_id
</sql>
<select id="selectUserByUserNameNew" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVoNew"/>
where u.user_name = #{userName} and u.del_flag = '0'
order by create_time desc LIMIT 1
</select>
<select id="selectRolesByUserId" parameterType="Long" resultMap="RoleResult">
select distinct
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user_role ur
inner join sys_role r on r.role_id = ur.role_id and r.del_flag = '0'
where ur.user_id = #{userId}
</select>
</mapper>