fangzhen il y a 6 mois
Parent
commit
5e81b386a2

+ 11 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -596,9 +596,19 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
         CommunityUserLikeVo communityUserLikeVo = null;
         for (CommunityUserLike communityUserLike : communityUserLikes) {
             communityUserLikeVo = new CommunityUserLikeVo();
+            //用户信息
+            SysUser sysUserLike = sysUserMapper.selectUserById(communityUserLike.getLikeUserId());
             SysUser sysUser = sysUserMapper.selectUserById(communityUserLike.getLikeUserId());
+            //用户自我介绍
+            CommunityUserInfo userInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", communityUserLike.getUserId()));
+            CommunityUserInfo likeUserInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", communityUserLike.getLikeUserId()));
             BeanUtils.copyProperties(communityUserLike, communityUserLikeVo);
-            communityUserLikeVo.setLikeUsername(sysUser.getUserName());
+            communityUserLikeVo.setProfile(userInfo.getProfile());
+            communityUserLikeVo.setAvatar(sysUser.getAvatar());
+            communityUserLikeVo.setUsername(sysUser.getUserName());
+            communityUserLikeVo.setLikeUsername(sysUserLike.getUserName());
+            communityUserLikeVo.setLikeAvatar(sysUserLike.getAvatar());
+            communityUserLikeVo.setLikeProfile(likeUserInfo.getProfile());
             communityUserLikeVos.add(communityUserLikeVo);
         }
         return communityUserLikeVos;

+ 20 - 0
ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityUserLikeVo.java

@@ -38,6 +38,16 @@ public class CommunityUserLikeVo implements Serializable {
      */
     @ApiModelProperty("关注人名称")
     private String username;
+    /**
+     * 关注人头像
+     */
+    @ApiModelProperty("关注人头像")
+    private String avatar;
+    /**
+     * 个人简介
+     */
+    @ApiModelProperty("个人简介")
+    private String profile;
     /**
     * 被关注人id
     */
@@ -49,6 +59,16 @@ public class CommunityUserLikeVo implements Serializable {
      */
     @ApiModelProperty("被关注人名称")
     private String likeUsername;
+    /**
+     * 被关注人头像
+     */
+    @ApiModelProperty("被关注人头像")
+    private String likeAvatar;
+    /**
+     * 被关注人个人简介
+     */
+    @ApiModelProperty("被关注人个人简介")
+    private String likeProfile;
     /**
     * 创建人
     */