修复使用邀请码查询邀请关系时,对邀请码大小写不敏感的问题
This commit is contained in:
parent
e54124e7c5
commit
54df36de5e
@ -963,7 +963,7 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
|
|||||||
Page: &artistInfoUser.UserCommonPageInfo{},
|
Page: &artistInfoUser.UserCommonPageInfo{},
|
||||||
}
|
}
|
||||||
var inviteRelationIds []int64
|
var inviteRelationIds []int64
|
||||||
db.DB.Model(model.UserInvited{}).Where("invite_code = ?", in.InviterCode).Pluck("invited_id", &inviteRelationIds)
|
db.DB.Model(model.UserInvited{}).Where("BINARY invite_code = ?", in.InviterCode).Pluck("invited_user_id", &inviteRelationIds)
|
||||||
var invitedList []model.User
|
var invitedList []model.User
|
||||||
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("id in ?", inviteRelationIds)
|
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("id in ?", inviteRelationIds)
|
||||||
if err = orm.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
|
if err = orm.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
|
||||||
@ -1029,7 +1029,7 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通过受邀请人的邀请码,查询他的邀请人列表 (被哪些人邀请过)
|
// 查询被哪些人邀请过
|
||||||
func GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) {
|
func GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) {
|
||||||
res = &artistInfoUser.GetInvitedUserListResponse{
|
res = &artistInfoUser.GetInvitedUserListResponse{
|
||||||
Data: []*artistInfoUser.InvitedUser{},
|
Data: []*artistInfoUser.InvitedUser{},
|
||||||
@ -1038,10 +1038,10 @@ func GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *arti
|
|||||||
PageSize: int32(in.PageSize),
|
PageSize: int32(in.PageSize),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
var inviteCodes []string
|
var inviterIds []string
|
||||||
db.DB.Model(model.UserInvited{}).Where("invited_code = ?", in.InvitedCode).Pluck("invite_code", &inviteCodes)
|
db.DB.Model(model.UserInvited{}).Where("BINARY invited_code = ?", in.InvitedCode).Pluck("invite_code", &inviterIds)
|
||||||
var invitedList []model.User
|
var invitedList []model.User
|
||||||
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("invited_code in ?", inviteCodes) //查询邀请人
|
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("id in ?", inviterIds) //查询邀请人
|
||||||
if err = orm.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
|
if err = orm.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user