jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xjjdev'

Browse Source
This commit is contained in:
徐俊杰 2023-04-19 13:27:48 +08:00
commit f3fe2cc76f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -33,4 +33,5 @@ yarn-error.log*
/cmd/logs/*.log
/cmd/runtime/log/*.log
/build/*
/build/*
conf/conf.ini

5
cmd/internal/dao/artistInfo_user.go
View File

@ -1031,10 +1031,11 @@ 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,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").
//.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")
orm := db.DB.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")
Where("sys_user.id in ?", inviteRelationIds).Order("invite.created_at desc").Where("sys_user.is_real_name=1")
if in.RealName != "" {
orm = orm.Where("rn.name like ?", "%"+in.RealName+"%")
}