Merge branch 'xjjdev'
This commit is contained in:
commit
ce5ae4cdc2
@ -550,7 +550,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
|
|||||||
datas = []model.User{}
|
datas = []model.User{}
|
||||||
tx = db.DB.Model(model.User{}).
|
tx = db.DB.Model(model.User{}).
|
||||||
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").
|
||||||
Preload("RealNameInfo").Where("sys_user.mgmt_artist_uid!=''")
|
Preload("RealNameInfo") //.Where("sys_user.mgmt_artist_uid!=''")
|
||||||
)
|
)
|
||||||
if req.InvitedCode != "" {
|
if req.InvitedCode != "" {
|
||||||
tx = tx.Where("invited_code = ?", req.InvitedCode)
|
tx = tx.Where("invited_code = ?", req.InvitedCode)
|
||||||
@ -571,7 +571,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
if req.IsArtist {
|
if req.IsArtist {
|
||||||
tx = tx.Where("mgmt_artist_uid !='' ")
|
tx = tx.Where("sys_user.mgmt_artist_uid !='' ")
|
||||||
}
|
}
|
||||||
if req.IsLock {
|
if req.IsLock {
|
||||||
tx = tx.Where("is_lock=true")
|
tx = tx.Where("is_lock=true")
|
||||||
|
Loading…
Reference in New Issue
Block a user