好友列表和申请列表 加入头像，族友圈加入头像

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMyFriends.java

@@ -55,11 +55,15 @@ public class TbMyFriends extends BaseEntity {
     @Excel(name = "状态： 1申请 2已通过 3未通过")
     private String status;
 
+    @ApiModelProperty(value="昵称")
     @TableField(exist = false)
     private String nickName;
     @TableField(exist = false)
     private String pyCode;
     @TableField(exist = false)
     private String pyFirst;
+    @ApiModelProperty(value="头像")
+    @TableField(exist = false)
+    private String avatar;
 
 }

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMyPublish.java

@@ -100,4 +100,13 @@ public class TbMyPublish extends BaseEntity {
     @ApiModelProperty(value="留念前缀")
     @TableField(exist = false)
     private String messageContent;
+
+    @ApiModelProperty(value="纪念留言人头像")
+    @TableField(exist = false)
+    private String messageUserAvatar;
+
+    @ApiModelProperty(value="会员头像")
+    @TableField(exist = false)
+    private String avatar;
+
 }

ruoyi-system/src/main/resources/mapper/app/TbMyFriendsMapper.xml

@@ -18,11 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="listFriends" resultType="com.ruoyi.app.domain.TbMyFriends" parameterType="String">
         select * from (
-            select f.*,u.nick_name,u.qrcode,u.py_code,u.py_first
+            select f.*,u.nick_name,u.qrcode,u.py_code,u.py_first,u.avatar
             from tb_my_friends f left join tb_app_user u on f.app_user_id = u.id
             where f.friends_user_id = #{id}
             union all
-            select g.*,u.nick_name,u.qrcode,u.py_code,u.py_first
+            select g.*,u.nick_name,u.qrcode,u.py_code,u.py_first,u.avatar
             from tb_my_friends g left join tb_app_user u on g.friends_user_id = u.id
             where app_user_id = #{id}
         ) a where 1=1
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectApply" resultType="com.ruoyi.app.domain.TbMyFriends" parameterType="String">
-        select f.*,u.nick_name,u.py_code,u.py_first
+        select f.*,u.nick_name,u.py_code,u.py_first,u.avatar
         from tb_my_friends f left join tb_app_user u on f.app_user_id = u.id
         ${ew.customSqlSegment}
     </select>

ruoyi-system/src/main/resources/mapper/app/TbMyPublishMapper.xml

@@ -30,7 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          from (
             select a.*,
             (select nick_name from tb_app_user us where us.id = a.app_user_id)nick_name,
+            (select avatar from tb_app_user us where us.id = a.app_user_id)avatar,
             (select nick_name from tb_app_user us where us.id = a.message_user_id)message_user,
+            (select avatar from tb_app_user us where us.id = a.message_user_id)message_user_avatar,
             (select count(1)  from tb_publish_thumbs where publish_id = a.id)thumbs
             from (
                 select * from tb_my_publish p