From 27a5d5de2b44ffbfdaa4b030123eb2076dca1668 Mon Sep 17 00:00:00 2001
From: jjxu <428192774@qq.com>
Date: Wed, 19 Apr 2023 11:41:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=82=80=E8=AF=B7=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/internal/dao/artistInfo_user.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go
index a40d26f..f789cd8 100644
--- a/cmd/internal/dao/artistInfo_user.go
+++ b/cmd/internal/dao/artistInfo_user.go
@@ -1031,9 +1031,10 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
 	var inviteRelationIds []int64
 	db.DB.Model(model.Invite{}).Where("BINARY invite_code = ?", in.InviterCode).Pluck("invited_id", &inviteRelationIds)
 	var invitedList []model.User
-	orm := db.DB.Model(model.User{}).Preload("RealNameInfo").
+	orm := db.DB.Select("sys_user.id,invite.created_at,sys_user.mgmt_acc_id,sys_user.mgmt_artist_uid,sys_user.tel_num,sys_user.invited_code,sys_user.account,sys_user.photo,sys_user.is_real_name,sys_user.fdd_state").Model(model.User{}).Preload("RealNameInfo").
 		Joins("LEFT JOIN real_name rn ON rn.id = sys_user.real_name_id").
-		Where("sys_user.id in ?", inviteRelationIds)
+		Joins("LEFT JOIN invite ON invite.invited_id = sys_user.id").
+		Where("sys_user.id in ?", inviteRelationIds).Order("invite.created_at desc")
 	if in.RealName != "" {
 		orm = orm.Where("rn.name like ?", "%"+in.RealName+"%")
 	}

From 4c5c88c2f1b67c4ac9a7aab16931361c4290712b Mon Sep 17 00:00:00 2001
From: jjxu <428192774@qq.com>
Date: Wed, 19 Apr 2023 12:04:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/internal/dao/artistInfo_user.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go
index f789cd8..5b6eda0 100644
--- a/cmd/internal/dao/artistInfo_user.go
+++ b/cmd/internal/dao/artistInfo_user.go
@@ -1031,7 +1031,7 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
 	var inviteRelationIds []int64
 	db.DB.Model(model.Invite{}).Where("BINARY invite_code = ?", in.InviterCode).Pluck("invited_id", &inviteRelationIds)
 	var invitedList []model.User
-	orm := db.DB.Select("sys_user.id,invite.created_at,sys_user.mgmt_acc_id,sys_user.mgmt_artist_uid,sys_user.tel_num,sys_user.invited_code,sys_user.account,sys_user.photo,sys_user.is_real_name,sys_user.fdd_state").Model(model.User{}).Preload("RealNameInfo").
+	orm := db.DB.Select("sys_user.id,sys_user.created_at,sys_user.mgmt_acc_id,sys_user.mgmt_artist_uid,sys_user.tel_num,sys_user.invited_code,sys_user.account,sys_user.photo,sys_user.is_real_name,sys_user.fdd_state").Model(model.User{}).Preload("RealNameInfo").
 		Joins("LEFT JOIN real_name rn ON rn.id = sys_user.real_name_id").
 		Joins("LEFT JOIN invite ON invite.invited_id = sys_user.id").
 		Where("sys_user.id in ?", inviteRelationIds).Order("invite.created_at desc")