代码优化

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -627,10 +627,22 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
         List<CommunityUserLikeVo> communityUserLikeVos = new ArrayList<>();
         CommunityUserLikeVo communityUserLikeVo = null;
         for (CommunityUserLike communityUserLike : communityUserLikes) {
+
+            //用户信息
+            SysUser sysUserLike = 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()));
             communityUserLikeVo = new CommunityUserLikeVo();
             BeanUtils.copyProperties(communityUserLike, communityUserLikeVo);
             SysUser sysUser = sysUserMapper.selectUserById(communityUserLike.getUserId());
+
+            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;
@@ -657,10 +669,22 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
             CommunityUserLikeVo communityUserLikeVo = null;
             communityUserLikeVos = new ArrayList<>();
             for (CommunityUserLike communityUserLike : communityUserLikes) {
+                //用户信息
+                SysUser sysUserLike = 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()));
+
                 communityUserLikeVo = new CommunityUserLikeVo();
                 BeanUtils.copyProperties(communityUserLike, communityUserLikeVo);
                 SysUser sysUser = sysUserMapper.selectUserById(communityUserLike.getUserId());
+                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);
             }
         }