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-05-26 20:13:34 +08:00
parent b5bce547c6
commit d7fa383cc2
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
View File

@@ -327,9 +327,9 @@ public class SsoService {
SysUser sysUser = null; SysUser sysUser = null;
if (StringUtils.isNotEmpty(personCardNo)) { if (StringUtils.isNotEmpty(personCardNo)) {
sysUser = sysUserService.selectUserByIdCard(personCardNo); sysUser = sysUserService.selectUserByIdCard(personCardNo);
} /*else { } else {
sysUser = sysUserService.selectUserById(userJson.getLong("userId")); sysUser = sysUserService.selectSysUserById(userJson.getLong("userId"));
}*/ }
if (sysUser == null) { if (sysUser == null) {
sysUser = saveSysUser(userJson, appUserId); sysUser = saveSysUser(userJson, appUserId);

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenSiteService.java
View File

@@ -70,7 +70,7 @@ public class TokenSiteService
Claims claims = parseToken(token); Claims claims = parseToken(token);
// 解析对应的权限以及用户信息 // 解析对应的权限以及用户信息
String uuid = (String) claims.get(Constants.APP_LOGIN_USER_KEY); String uuid = (String) claims.get(Constants.APP_LOGIN_USER_KEY);
Integer userID = (Integer) claims.get(Constants.APP_LOGIN_USER_ID); Long userID = Long.parseLong(claims.get(Constants.APP_LOGIN_USER_ID).toString());
String userKey = getTokenKey(uuid, String.valueOf(userID)); String userKey = getTokenKey(uuid, String.valueOf(userID));
LoginSiteUser user = redisCache.getCacheObject(userKey); LoginSiteUser user = redisCache.getCacheObject(userKey);
return user; return user;

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

@@ -136,4 +136,12 @@ public interface SysUserMapper
* @return * @return
*/ */
SysUser selectUserByIdCard(String idCard); SysUser selectUserByIdCard(String idCard);
/**
* 通过用户ID查询用户
*
* @param userId 用户ID
* @return 用户对象信息
*/
public SysUser selectSysUserById(Long userId);
} }

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

@@ -559,4 +559,9 @@ public class SysUserServiceImpl implements ISysUserService
public SysUser selectUserByIdCard(String idCard) { public SysUser selectUserByIdCard(String idCard) {
return userMapper.selectUserByIdCard(idCard); return userMapper.selectUserByIdCard(idCard);
} }
public SysUser selectSysUserById(Long userId){
return userMapper.selectSysUserById(userId);
}
} }

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

@@ -239,5 +239,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserByIdCard" resultType="com.ruoyi.common.core.domain.entity.SysUser"> <select id="selectUserByIdCard" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1 select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1
</select> </select>
<select id="selectSysUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
</select>
</mapper> </mapper>