Merge branch 'main' of http://192.168.12.3:8090/bugmaker/fonchain-artistinfo into jujin
This commit is contained in:
commit
95cfaf462a
@ -970,7 +970,7 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
|
||||
var invitedList []model.User
|
||||
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").
|
||||
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 != "" {
|
||||
orm = orm.Where("rn.name like ?", "%"+in.RealName+"%")
|
||||
}
|
||||
@ -1050,7 +1050,7 @@ func GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *arti
|
||||
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)
|
||||
var invitedList []model.User
|
||||
orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("id in ?", inviterIds) //查询邀请人
|
||||
|
Loading…
Reference in New Issue
Block a user