From 0c22ad4d3bf3efe917987db8e8792492812e3a32 Mon Sep 17 00:00:00 2001
From: zhouyl <583641232@qq.com>
Date: Thu, 26 Sep 2024 16:13:49 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=94=A8=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C/=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tp-system/src/main/resources/mapper/system/SysUserMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tp-system/src/main/resources/mapper/system/SysUserMapper.xml b/tp-system/src/main/resources/mapper/system/SysUserMapper.xml
index db969e9..82c8d86 100644
--- a/tp-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/tp-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="companyName" column="company_name"/>
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
@@ -86,7 +87,7 @@
 
     <select id="selectPageUserList" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.company_name,  d.dept_name, d.leader
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
         ${ew.getCustomSqlSegment}