From 89bf5e54a5446c721f72e3374a71f7aeb33f69ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Wed, 31 Jan 2024 18:43:06 +0800
Subject: [PATCH] 123

---
 .../src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java | 4 ++++
 ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml        | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java
index 7da14c65..7c5eb29e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java
@@ -24,4 +24,8 @@ public class UserAdminVo extends User {
      * 注册时间
      */
     private LocalDateTime regTime;
+
+    private String inviteUsercode;
+    private String inviteNickname;
+    private String inviteAvatar;
 }
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
index 55863e28..5cb048e3 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
@@ -5,9 +5,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.cai.mapper.UserMapper">
 
     <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.UserAdminVo">
-        select t1.*,t2.last_login_ip,t2.last_login_time,t2.reg_ip,t2.reg_time
+        select t1.*,t2.last_login_ip,t2.last_login_time,t2.reg_ip,t2.reg_time,
+               t3.usercode as invite_usercode, t3.nickname as invite_nickname, t3.avatar as invite_avatar
         from cai_user t1
         left join cai_user_info t2 on t1.id = t2.user_id
+        left join cai_user t3 on t1.invite_id = t3.id
         <where>
             <if test="query.isAnchor != null">
                 and t1.is_anchor = #{query.isAnchor}