mirror of https://gitee.com/answerdev/answer.git
update search user
This commit is contained in:
parent
0744658d7a
commit
a7948729d5
|
@ -623,6 +623,7 @@ func (uc *UserController) SearchUserListByName(ctx *gin.Context) {
|
|||
if handler.BindAndCheck(ctx, req) {
|
||||
return
|
||||
}
|
||||
resp, err := uc.userService.SearchUserListByName(ctx, req.Username)
|
||||
req.UserID = middleware.GetLoginUserIDFromContext(ctx)
|
||||
resp, err := uc.userService.SearchUserListByName(ctx, req)
|
||||
handler.HandleResponse(ctx, err, resp)
|
||||
}
|
||||
|
|
|
@ -355,6 +355,7 @@ type UserBasicInfo struct {
|
|||
|
||||
type GetOtherUserInfoByUsernameReq struct {
|
||||
Username string `validate:"required,gt=0,lte=500" form:"username"`
|
||||
UserID string `json:"-"`
|
||||
}
|
||||
|
||||
type GetOtherUserInfoResp struct {
|
||||
|
|
|
@ -567,10 +567,7 @@ func (qs *QuestionService) UpdateQuestionInviteUser(ctx context.Context, req *sc
|
|||
for _, item := range req.InviteUser {
|
||||
_, ok := inviteUserInfoList[item]
|
||||
if ok {
|
||||
//The inviter can't be himself.
|
||||
if req.UserID != inviteUserInfoList[item].ID {
|
||||
inviteUserIDs = append(inviteUserIDs, inviteUserInfoList[item].ID)
|
||||
}
|
||||
inviteUserIDs = append(inviteUserIDs, inviteUserInfoList[item].ID)
|
||||
}
|
||||
}
|
||||
inviteUserStr := ""
|
||||
|
|
|
@ -817,17 +817,20 @@ func (us *UserService) getUserInfoMapping(ctx context.Context, userIDs []string)
|
|||
return userInfoMapping, nil
|
||||
}
|
||||
|
||||
func (us *UserService) SearchUserListByName(ctx context.Context, name string) ([]*schema.UserBasicInfo, error) {
|
||||
func (us *UserService) SearchUserListByName(ctx context.Context, input *schema.GetOtherUserInfoByUsernameReq) ([]*schema.UserBasicInfo, error) {
|
||||
userinfolist := make([]*schema.UserBasicInfo, 0)
|
||||
list, err := us.userRepo.SearchUserListByName(ctx, name)
|
||||
list, err := us.userRepo.SearchUserListByName(ctx, input.Username)
|
||||
if err != nil {
|
||||
return userinfolist, err
|
||||
}
|
||||
avatarMapping := us.siteInfoService.FormatListAvatar(ctx, list)
|
||||
for _, user := range list {
|
||||
userinfo := us.userCommonService.FormatUserBasicInfo(ctx, user)
|
||||
userinfo.Avatar = avatarMapping[user.ID].GetURL()
|
||||
userinfolist = append(userinfolist, userinfo)
|
||||
if input.UserID != user.ID {
|
||||
userinfo := us.userCommonService.FormatUserBasicInfo(ctx, user)
|
||||
userinfo.Avatar = avatarMapping[user.ID].GetURL()
|
||||
userinfolist = append(userinfolist, userinfo)
|
||||
}
|
||||
|
||||
}
|
||||
return userinfolist, nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue