1.头像统一调整使用sysUser表中的头像

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -31,7 +31,6 @@
         , t.tenant_id_ as tenantId
         , t.create_time_ as `createTime`
         , t.update_time_ as `updateTime`
-        , t.avatar_ as `avatar`
         </sql>
     <update id="setSubject">
         update student set subject_id_ = #{subjectIds},update_time_ = now() where user_id_ = #{id}
@@ -42,6 +41,7 @@
             <include refid="baseColumns"/>,
             if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
             u.avatar_ as userAvatar,
+            u.avatar_ as avatar,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.username_ as username,
@@ -66,6 +66,7 @@
         SELECT
             <include refid="baseColumns"/>,
             if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
+            u.avatar_ as avatar,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.username_ as username,
@@ -89,6 +90,7 @@
             <include refid="baseColumns"/>,
             if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
             u.avatar_ as userAvatar,
+            u.avatar_ as avatar,
             u.username_ as username,
             u.gender_ as gender,
             u.birthdate_ as birthdate,
@@ -276,7 +278,7 @@
     <select id="queryMyFollow" resultMap="queryMyFollowResult">
         SELECT
             s.teacher_id_ as userId,
-            tr.avatar_ as avatar,
+            u.avatar_ as avatar,
             u.username_ as userName,
             u.real_name_ as realName,
             u.gender_ as gender,

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -99,7 +99,7 @@
         u.username_ as username,
         u.phone_ as phone,
         u.real_name_ as realName,
-        if (t.avatar_ = '' OR t.avatar_ IS NULL, u.avatar_, t.avatar_) as avatar,
+        u.avatar_ as avatar,
         u.birthdate_ as birthdate,
         u.gender_ as gender,
         (case when t.membership_end_time_ >= now() then 1 else 0 end) isVip,
@@ -227,7 +227,7 @@
         SELECT
         <include refid="baseColumns"/>,
         if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
-        if(t.avatar_ = '' OR t.avatar_ = NULL, u.avatar_, t.avatar_) as avatar,
+        u.avatar_ as avatar,
         u.username_ as username,
         u.gender_ as `gender`,
         u.birthdate_ as birthdate,