update 优化 三方登录接口代码逻辑

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java

@@ -27,6 +27,11 @@ public class SysSocial extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
     /**
      * 的唯一ID
      */
@@ -57,11 +62,6 @@ public class SysSocial extends TenantEntity {
      */
     private String openId;
 
-    /**
-     * 用户的 ID
-     */
-    private Long userId;
-
     /**
      * 授权的第三方账号
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java

@@ -29,6 +29,12 @@ public class SysSocialVo implements Serializable {
     @ExcelProperty(value = "主键")
     private Long id;
 
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
     /**
      * 租户ID
      */
@@ -70,12 +76,6 @@ public class SysSocialVo implements Serializable {
     @ExcelProperty(value = "用户的 open id")
     private String openId;
 
-    /**
-     * 用户的 ID
-     */
-    @ExcelProperty(value = "用户的 ID")
-    private Long userId;
-
     /**
      * 授权的第三方账号
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java

@@ -11,12 +11,4 @@ import org.dromara.system.domain.vo.SysSocialVo;
  */
 public interface SysSocialMapper extends BaseMapperPlus<SysSocial, SysSocialVo> {
 
-    /**
-     * 根据 authId 查询 SysSocial 表和 SysUser 表，返回 SysSocialAuthResult 映射的对象
-     *
-     * @param authId 认证ID
-     * @return SysSocial
-     */
-    SysSocialVo selectByAuthId(String authId);
-
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java

@@ -86,12 +86,12 @@ public class SysSocialServiceImpl implements ISysSocialService {
     /**
      * 根据 authId 查询用户信息
      *
-     * @param authId 用户id
-     * @return 用户信息
+     * @param authId 认证id
+     * @return 授权信息
      */
     @Override
     public SysSocialVo selectByAuthId(String authId) {
-        return baseMapper.selectByAuthId(authId);
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysSocial>().eq(SysSocial::getAuthId, authId));
     }
 
 }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml

@@ -4,20 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.SysSocialMapper">
 
-    <resultMap type="org.dromara.system.domain.vo.SysSocialVo" id="SysSocialAuthResult">
-        <id property="id" column="id"/>
-    </resultMap>
-
-    <select id="selectByAuthId" parameterType="String" resultMap="SysSocialAuthResult">
-        select b.user_id,
-               b.tenant_id,
-               b.user_name,
-               b.password,
-               a.auth_id,
-               a.source
-        from sys_social a
-                 left join sys_user b on a.user_id = b.user_id
-        where a.auth_id = #{authId}
-    </select>
-
 </mapper>