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

Merge branch 'xjjdev' into dev

Browse Source
This commit is contained in:
徐俊杰 2023-03-24 14:41:14 +08:00
commit 793a436630
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -970,7 +970,7 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
var invitedList []model.User var invitedList []model.User
orm := db.DB.Model(model.User{}).Preload("RealNameInfo"). 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 real_name rn ON rn.id = sys_user.real_name_id").
Where("id in ?", inviteRelationIds) Where("sys_user.id in ?", inviteRelationIds)
if in.RealName != "" { if in.RealName != "" {
orm = orm.Where("rn.name like ?", "%"+in.RealName+"%") orm = orm.Where("rn.name like ?", "%"+in.RealName+"%")
} }
@ -1051,7 +1051,7 @@ func GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *arti
PageSize: int32(in.PageSize), PageSize: int32(in.PageSize),
}, },
} }
var inviterIds []string var inviterIds []int64
db.DB.Model(model.UserInvited{}).Where("BINARY invited_code = ?", in.InvitedCode).Pluck("user_id", &inviterIds) db.DB.Model(model.UserInvited{}).Where("BINARY invited_code = ?", in.InvitedCode).Pluck("user_id", &inviterIds)
var invitedList []model.User var invitedList []model.User
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("id in ?", inviterIds) //查询邀请人 orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("id in ?", inviterIds) //查询邀请人