Merge branch 'xjjdev'

This commit is contained in:
徐俊杰 2023-04-19 12:04:36 +08:00
commit fa3364b20a

View File

@ -1031,9 +1031,10 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
var inviteRelationIds []int64 var inviteRelationIds []int64
db.DB.Model(model.Invite{}).Where("BINARY invite_code = ?", in.InviterCode).Pluck("invited_id", &inviteRelationIds) db.DB.Model(model.Invite{}).Where("BINARY invite_code = ?", in.InviterCode).Pluck("invited_id", &inviteRelationIds)
var invitedList []model.User var invitedList []model.User
orm := db.DB.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 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 != "" { if in.RealName != "" {
orm = orm.Where("rn.name like ?", "%"+in.RealName+"%") orm = orm.Where("rn.name like ?", "%"+in.RealName+"%")
} }