Merge branch 'xjjdev'

This commit is contained in:
徐俊杰 2023-04-03 14:56:00 +08:00
commit ce5ae4cdc2

View File

@ -550,7 +550,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
datas = []model.User{}
tx = db.DB.Model(model.User{}).
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 != "" {
tx = tx.Where("invited_code = ?", req.InvitedCode)
@ -571,7 +571,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
})
}
if req.IsArtist {
tx = tx.Where("mgmt_artist_uid !='' ")
tx = tx.Where("sys_user.mgmt_artist_uid !='' ")
}
if req.IsLock {
tx = tx.Where("is_lock=true")