diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index f6048a21d..804045b27 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -13,7 +13,6 @@ import ( "Open_IM/pkg/getcdv3" pbConversation "Open_IM/pkg/proto/conversation" pbFriend "Open_IM/pkg/proto/friend" - sdkws "Open_IM/pkg/proto/sdk_ws" pbUser "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" "context" @@ -586,46 +585,19 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb return &resp, nil } - usersDB, err = imdb.GetUsers(req.Pagination.ShowNumber, req.Pagination.PageNumber) + usersDB, total, err := s.Get(ctx, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUsers failed", req.Pagination.ShowNumber, req.Pagination.PageNumber, err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil - } - resp.TotalNums, err = imdb.GetTotalUserNum() - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } + resp.Total = int32(total) + for _, userDB := range usersDB { - var user sdkws.UserInfo - utils.CopyStructFields(&user, userDB) - user.CreateTime = uint32(userDB.CreateTime.Unix()) - user.BirthStr = utils.TimeToString(userDB.Birth) - resp.UserList = append(resp.UserList, &pbUser.CmsUser{User: &user}) - } - - var userIDList []string - for _, v := range resp.UserList { - userIDList = append(userIDList, v.User.UserID) - } - isBlockUser, err := imdb.UsersIsBlock(userIDList) - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userIDList) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil - } - - for _, v := range resp.UserList { - if utils.IsContain(v.User.UserID, isBlockUser) { - v.IsBlock = true + u, err := utils2.NewDBUser(userDB).Convert() + if err != nil { + return nil, err } + resp.Users = append(resp.Users, u) } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) - return resp, nil + return &resp, nil } diff --git a/internal/utils/convert.go b/internal/utils/convert.go index 61dc80586..1660219ae 100644 --- a/internal/utils/convert.go +++ b/internal/utils/convert.go @@ -281,7 +281,7 @@ func (pb *PBUser) Convert() (*relation.User, error) { func (db *DBUser) Convert() (*sdk.UserInfo, error) { dst := &sdk.UserInfo{} utils.CopyStructFields(dst, db) - dst.CreateTime = uint32(db.CreateTime.Unix()) + dst.CreateTime = db.CreateTime.Unix() dst.Birthday = db.Birth.Unix() return dst, nil }