From 77f4fcda25af2c83fd1fb47ab8308d8cb92c04c0 Mon Sep 17 00:00:00 2001
From: David Wei <>
Date: Tue, 21 Nov 2023 17:27:12 +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

---
 .../dromara/web/service/SysLoginService.java    |  9 +--------
 .../dromara/system/mapper/SysUserMapper.java    |  9 +++++++++
 .../resources/mapper/system/SysUserMapper.xml   | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 9 deletions(-)

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 da9e2337d..740ffaf0a 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
@@ -80,14 +80,7 @@ public class SysLoginService {
                 throw new UserException("user.blocked", account);
             }
 
-            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;
+            return userMapper.selectUser(loginType, account);
         });
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
index 43222253c..789d47b92 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -61,6 +62,14 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
     })
     Page<SysUserVo> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
 
+    /**
+     * 通过用户名查询用户
+     *
+     * @param account 账号：手机/邮箱/密码/UserId
+     * @return 用户对象信息
+     */
+    SysUserVo selectUser(LoginType loginType, String account);
+
     /**
      * 通过用户名查询用户
      *
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7af7dd0cc..03a94de42 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -123,5 +123,20 @@
         where u.del_flag = '0' and u.user_id = #{userId}
     </select>
 
-
+    <select id="selectUser" parameterType="Long" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.del_flag = '0'
+        <if test="loginType.toString() == 'SMS'">
+            and u.phonenumber = #{account}
+        </if>
+        <if test="loginType.toString() == 'EMAIL'">
+            and u.email = #{account}
+        </if>
+        <if test="loginType.toString() == 'PASSWORD'">
+            and u.user_name = #{account}
+        </if>
+        <if test="loginType.toString() == 'SOCIAL'">
+            and u.user_id = #{account}
+        </if>
+    </select>
 </mapper>