From 33173e4db11ae11bc3838a0e02df697dc9cb1b1a Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 18 Nov 2024 21:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8B=E7=BA=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E4=B8=8B=E7=BA=A7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/common/system/entity/UserReferee.java   | 8 ++++----
 .../system/service/impl/UserRefereeServiceImpl.java       | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java b/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java
index 8e8cf01..9c98431 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java
@@ -1,10 +1,8 @@
 package com.gxwebsoft.common.system.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -55,4 +53,6 @@ public class UserReferee implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    @TableField(exist = false)
+    private User user;
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java
index 420c133..304c3d8 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java
@@ -8,8 +8,10 @@ import com.gxwebsoft.common.system.entity.UserReferee;
 import com.gxwebsoft.common.system.param.UserRefereeParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.service.UserService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,11 +23,17 @@ import java.util.List;
 @Service
 public class UserRefereeServiceImpl extends ServiceImpl<UserRefereeMapper, UserReferee> implements UserRefereeService {
 
+    @Resource
+    private UserService userService;
+
     @Override
     public PageResult<UserReferee> pageRel(UserRefereeParam param) {
         PageParam<UserReferee, UserRefereeParam> page = new PageParam<>(param);
         page.setDefaultOrder("create_time desc");
         List<UserReferee> list = baseMapper.selectPageRel(page, param);
+        for (UserReferee userReferee : list) {
+            userReferee.setUser(userService.getById(userReferee.getUserId()));
+        }
         return new PageResult<>(list, page.getTotal());
     }