From a8c57bb4128bbd4a4e6ab83688f4a52bb9c914ea Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 5 Jun 2025 10:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=BA=E8=84=B8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysUserMapper.xml    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index b5339b7..b239068 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -71,7 +71,7 @@
                u.nick_name,
                u.email,
                u.avatar,
-               u.photo_url,
+               uf.photo_url,
                u.birthday,
                u.phonenumber,
                u.password,
@@ -107,12 +107,13 @@
                  left join sys_user_role ur on u.user_id = ur.user_id
                  left join sys_role r on r.role_id = ur.role_id
                  left join sys_dept sd on r.company_id = sd.dept_id
+                 left join user_face uf on uf.user_id = u.user_id
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" 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.birthday,
                 u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,
-                u.is_permanent,u.is_built_in, u.photo_url, u.effective_start_day, u.effective_end_day,
+                u.is_permanent,u.is_built_in, uf.photo_url, u.effective_start_day, u.effective_end_day,
                 d.dept_name, d.leader,r.role_id,
                 r.role_name,
                 r.role_key,
@@ -123,6 +124,7 @@
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
+        left join user_face uf on uf.user_id = u.user_id
         where u.del_flag = '0'
         <if test="userId != null and userId != 0">
             AND u.user_id = #{userId}
@@ -281,6 +283,7 @@
         <if test="nickName != null and nickName != ''">nick_name,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="avatar != null and avatar != ''">avatar,</if>
+        <if test="photoUrl != null and photoUrl != ''">photo_url,</if>
         <if test="birthday != null and birthday != ''">birthday,</if>
         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
         <if test="sex != null and sex != ''">sex,</if>
@@ -303,6 +306,7 @@
         <if test="nickName != null and nickName != ''">#{nickName},</if>
         <if test="email != null and email != ''">#{email},</if>
         <if test="avatar != null and avatar != ''">#{avatar},</if>
+        <if test="photoUrl != null and photoUrl != ''">#{photoUrl},</if>
         <if test="birthday != null and birthday != ''">#{birthday},</if>
         <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
         <if test="sex != null and sex != ''">#{sex},</if>