diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java index a7e186d..4cd0d89 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserFriendVo.java @@ -45,6 +45,11 @@ public class AppUserFriendVo extends AppUserFriend return avatarUrl; } + private String fUsername; + private String fNickname; + private Integer fCheck; + private String fAvatarUrl; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java index e34c345..4368b95 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java @@ -2,7 +2,9 @@ package com.ruoyi.app.service.impl; import java.util.List; +import com.ruoyi.app.domain.AppUser; import com.ruoyi.app.domain.vo.AppUserFriendVo; +import com.ruoyi.app.mapper.AppUserMapper; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +25,9 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService @Autowired private AppUserFriendMapper appUserFriendMapper; + @Autowired + private AppUserMapper appUserMapper; + /** * 查询用户好友 * @@ -44,7 +49,15 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService @Override public List selectAppUserFriendList(AppUserFriend appUserFriend) { - return appUserFriendMapper.selectFriendList(appUserFriend); + List list = appUserFriendMapper.selectFriendList(appUserFriend); + for (AppUserFriendVo appUserFriendVo : list) { + AppUser appUser = appUserMapper.selectAppUserById(appUserFriendVo.getUserId()); + appUserFriendVo.setFUsername(appUser.getUsername()); + appUserFriendVo.setFAvatarUrl(appUser.getAvatarUrl()); + appUserFriendVo.setFNickname(appUser.getNickname()); + appUserFriendVo.setFCheck(appUser.getCheck()); + } + return list; } /**