From 31afc8ef795e1abe0c66cade76b0dc49692b1d1d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 22 十月 2026 15:20:33 +0800
Subject: [PATCH] 用户管理增加机构id,机构名称字段

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   10 +++++++++-
 1 files changed, 9 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 e9f836f..8f3ebdd 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"/>
@@ -61,6 +62,7 @@
                u.ding_user_id,
                u.error_nums,
                u.error_times,
+               u.user_type,
                u.user_name,
                u.nick_name,
                u.email,
@@ -169,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"/>
@@ -223,6 +225,8 @@
         <if test="status != null and status != ''">status,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="remark != null and remark != ''">remark,</if>
+        <if test="orgId != null and orgId != ''">org_id,</if>
+        <if test="orgName != null and orgName != ''">org_name,</if>
         <if test="dingUserId != null and dingUserId != ''">ding_user_id,</if>
         create_time
         )values(
@@ -238,6 +242,8 @@
         <if test="status != null and status != ''">#{status},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="orgId != null and orgId != ''">#{org_id},</if>
+        <if test="orgName != null and orgName != ''">#{org_name},</if>
         <if test="dingUserId != null and dingUserId != ''">#{dingUserId},</if>
         sysdate()
         )
@@ -261,6 +267,8 @@
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="errorNums != null">error_nums = #{errorNums},</if>
+            <if test="orgId != null">org_id = #{orgId},</if>
+            <if test="orgName != null">org_name = #{orgName},</if>
             <if test="dingUserId != null and dingUserId != ''">ding_user_id = #{dingUserId},</if>
             update_time = sysdate()
         </set>

--
Gitblit v1.9.3