|
@@ -607,11 +607,12 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
|
|
|
communityUserLikeVo = new CommunityUserLikeVo();
|
|
|
//用户信息
|
|
|
SysUser sysUserLike = sysUserMapper.selectUserById(communityUserLike.getLikeUserId());
|
|
|
- SysUser sysUser = sysUserMapper.selectUserById(communityUserLike.getLikeUserId());
|
|
|
+ SysUser sysUser = sysUserMapper.selectUserById(communityUserLike.getUserId());
|
|
|
//用户自我介绍
|
|
|
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);
|
|
|
+
|
|
|
if (Objects.nonNull(userInfo)) {
|
|
|
communityUserLikeVo.setProfile(userInfo.getProfile());
|
|
|
}
|
|
@@ -622,11 +623,11 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
|
|
|
|
|
|
if (Objects.nonNull(sysUser)) {
|
|
|
communityUserLikeVo.setAvatar(sysUser.getAvatar());
|
|
|
- communityUserLikeVo.setUsername(sysUser.getUserName());
|
|
|
+ communityUserLikeVo.setUsername(sysUser.getNickName());
|
|
|
}
|
|
|
|
|
|
if (Objects.nonNull(sysUserLike)) {
|
|
|
- communityUserLikeVo.setLikeUsername(sysUserLike.getUserName());
|
|
|
+ communityUserLikeVo.setLikeUsername(sysUserLike.getNickName());
|
|
|
communityUserLikeVo.setLikeAvatar(sysUserLike.getAvatar());
|
|
|
}
|
|
|
|