blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-19 20:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

new feat: sync designated model

Browse Source
This commit is contained in:
wangchuxiao 2023-07-25 17:20:35 +08:00
parent 26cb6e4d50
commit f6a98760a1
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/group/group.go
View File

@ -1448,7 +1448,6 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
if err != nil {
return nil, err
}
resp.Total = int64(total)
if len(requests) == 0 {
return resp, nil
}
@ -1482,5 +1481,6 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
resp.GroupRequests = utils.Slice(requests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
return convert.Db2PbGroupRequest(e, nil, convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID])))
})
resp.Total = total
return resp, nil
}

9
pkg/common/db/relation/group_request_model.go
View File

@ -112,11 +112,6 @@ func (g *GroupRequestGorm) PageGroup(
}
func (g *GroupRequestGorm) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (total int64, groupRequests []*relation.GroupRequestModel, err error) {
return int64(len(groupRequests)), groupRequests, utils.Wrap(
g.DB.WithContext(ctx).
Where("group_id = ? and user_id in ?", groupID, userIDs).
Find(&groupRequests).
Error,
utils.GetSelfFuncName(),
)
err = g.DB.WithContext(ctx).Where("group_id = ? and user_id in ?", groupID, userIDs).Find(&groupRequests).Error
return int64(len(groupRequests)), groupRequests, utils.Wrap(err, utils.GetSelfFuncName())
}