From c8fceb65958a1992d5b6df13f209a9da5ac121a1 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 14 七月 2026 09:59:30 +0800
Subject: [PATCH] 手机号和工号同时可登
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0996f6f..e675831 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -10,6 +10,7 @@
<result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/>
<result property="nickName" column="nick_name"/>
+ <result property="userType" column="user_type"/>
<result property="email" column="email"/>
<result property="phonenumber" column="phonenumber"/>
<result property="sex" column="sex"/>
@@ -28,9 +29,12 @@
<result property="errorTimes" column="error_times"/>
<result property="standardlevel" column="standardlevel"/>
<result property="dingUserId" column="ding_user_id"/>
+ <result property="orgId" column="org_id"/>
+ <result property="orgName" column="org_name"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept"
resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
+
</resultMap>
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
@@ -58,6 +62,7 @@
u.ding_user_id,
u.error_nums,
u.error_times,
+ u.user_type,
u.user_name,
u.nick_name,
u.email,
@@ -73,6 +78,8 @@
u.create_time,
u.remark,
u.standardlevel,
+ u.org_id,
+ u.org_name,
d.dept_id,
d.parent_id,
d.dept_name,
@@ -164,7 +171,7 @@
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
- where u.user_name = #{userName}
+ where u.user_name = #{userName} or u.phonenumber = #{userName}
</select>
<select id="selectUserByDingUserId" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
--
Gitblit v1.9.3