From 06aeedd8707c3e8ec0050b69e0568a65b548a354 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Fri, 31 May 2024 16:28:36 +0800
Subject: [PATCH] ~

---
 .../java/com/ruoyi/app/domain/AppUserFans.java  |  8 ++++++++
 .../service/impl/AppUserFansServiceImpl.java    | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserFans.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserFans.java
index 1f1f75e..b9ba61c 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserFans.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserFans.java
@@ -1,5 +1,6 @@
 package com.ruoyi.app.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author wyh
  * @date 2024-05-08
  */
+@Data
 public class AppUserFans extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -30,6 +32,12 @@ public class AppUserFans extends BaseEntity
     @Excel(name = "状态：0好友1拉黑")
     private Long status;
 
+    private String username;
+    private String nickname;
+    private Integer check;
+
+    private String avatarUrl;
+
     public void setId(Long id) 
     {
         this.id = id;
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFansServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFansServiceImpl.java
index c1a90cd..69b5b6c 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFansServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFansServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.app.domain.AppUser;
 import com.ruoyi.app.domain.AppUserFriend;
+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;
@@ -24,6 +25,9 @@ public class AppUserFansServiceImpl implements IAppUserFansService
     @Autowired
     private AppUserFansMapper appUserFansMapper;
 
+    @Autowired
+    private AppUserMapper appUserMapper;
+
     /**
      * 查询用户关注
      * 
@@ -43,9 +47,16 @@ public class AppUserFansServiceImpl implements IAppUserFansService
      * @return 用户关注
      */
     @Override
-    public List<AppUserFans> selectAppUserFansList(AppUserFans appUserFans)
-    {
-        return appUserFansMapper.selectAppUserFansList(appUserFans);
+    public List<AppUserFans> selectAppUserFansList(AppUserFans appUserFans) {
+        List<AppUserFans> list = appUserFansMapper.selectAppUserFansList(appUserFans);
+        for (AppUserFans userFans : list) {
+            AppUser appUser = appUserMapper.selectAppUserById(userFans.getUserId());
+            userFans.setUsername(appUser.getUsername());
+            userFans.setAvatarUrl(appUser.getAvatarUrl());
+            userFans.setNickname(appUser.getNickname());
+            userFans.setCheck(appUser.getCheck());
+        }
+        return list;
     }
 
     /**