From d7fa383cc2a7b75112bdadaa2fbcc4f789285257 Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Tue, 26 May 2026 20:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/web/service/SsoService.java  | 6 +++---
 .../com/ruoyi/framework/web/service/TokenSiteService.java | 2 +-
 .../main/java/com/ruoyi/system/mapper/SysUserMapper.java  | 8 ++++++++
 .../com/ruoyi/system/service/impl/SysUserServiceImpl.java | 5 +++++
 .../src/main/resources/mapper/system/SysUserMapper.xml    | 5 +++++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
index efa8bf6..fbe0535 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
@@ -327,9 +327,9 @@ public class SsoService {
         SysUser sysUser = null;
         if (StringUtils.isNotEmpty(personCardNo)) {
             sysUser = sysUserService.selectUserByIdCard(personCardNo);
-        } /*else {
-            sysUser = sysUserService.selectUserById(userJson.getLong("userId"));
-        }*/
+        } else {
+            sysUser = sysUserService.selectSysUserById(userJson.getLong("userId"));
+        }
 
         if (sysUser == null) {
             sysUser = saveSysUser(userJson, appUserId);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenSiteService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenSiteService.java
index b601d80..6beb812 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenSiteService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenSiteService.java
@@ -70,7 +70,7 @@ public class TokenSiteService
                 Claims claims = parseToken(token);
                 // 解析对应的权限以及用户信息
                 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));
                 LoginSiteUser user = redisCache.getCacheObject(userKey);
                 return user;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 9d14732..0794d1d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -136,4 +136,12 @@ public interface SysUserMapper
      * @return
      */
     SysUser selectUserByIdCard(String idCard);
+
+    /**
+     * 通过用户ID查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    public SysUser selectSysUserById(Long userId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 38b6c72..cb6de5b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -559,4 +559,9 @@ public class SysUserServiceImpl implements ISysUserService
     public SysUser selectUserByIdCard(String idCard) {
         return userMapper.selectUserByIdCard(idCard);
     }
+
+    public SysUser selectSysUserById(Long userId){
+        return userMapper.selectSysUserById(userId);
+    }
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7e43a5a..58efaea 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -239,5 +239,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<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>
+
+	<select id="selectSysUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
+		<include refid="selectUserVo"/>
+		where u.user_id = #{userId}
+	</select>
 	
 </mapper> 
\ No newline at end of file