From 6dfa1080be1add05f612b70d0e51a22da2b353b0 Mon Sep 17 00:00:00 2001
From: David Wei <>
Date: Tue, 21 Nov 2023 17:06:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8E=88=E6=9D=83=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?loadUser()=E6=8F=90=E5=8F=96=E4=B8=BA=E5=85=AC=E6=9C=89?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/web/service/SysLoginService.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index 1d393fe09..da9e2337d 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -66,6 +66,7 @@ public class SysLoginService {
     public SysUserVo loadUser(LoginType loginType, String tenantId, String account) {
         return TenantHelper.dynamic(tenantId, () -> {
             SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getUserId, SysUser::getStatus)
                 .eq(LoginType.SMS == loginType, SysUser::getPhonenumber, account)
                 .eq(LoginType.EMAIL == loginType, SysUser::getEmail, account)
                 .eq(LoginType.PASSWORD == loginType, SysUser::getUserName, account)
@@ -78,7 +79,15 @@ public class SysLoginService {
                 log.info("登录用户：{} 已被停用.", account);
                 throw new UserException("user.blocked", account);
             }
-            return MapstructUtils.convert(user, SysUserVo.class);
+
+            SysUserVo sysUserVo = null;
+            switch (loginType) {
+                case SMS: sysUserVo = userMapper.selectUserByPhonenumber(account); break;
+                case EMAIL: sysUserVo = userMapper.selectUserByEmail(account); break;
+                case PASSWORD: sysUserVo = userMapper.selectUserByUserName(account); break;
+                case SOCIAL: sysUserVo = userMapper.selectUserById(Long.parseLong(account)); break;
+            }
+            return sysUserVo;
         });
     }