修改问题

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);

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;

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);
 }

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);
+    }
+
 }

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>