blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

null to empty slice

Browse Source
This commit is contained in:
wangchuxiao 2022-04-01 15:32:24 +08:00
parent b82ff7b88d
commit 77c6120014
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/office/office.go
View File

@ -70,8 +70,9 @@ func (s *officeServer) GetUserTags(_ context.Context, req *pbOffice.GetUserTagsR
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req ", req.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req ", req.String())
resp = &pbOffice.GetUserTagsResp{ resp = &pbOffice.GetUserTagsResp{
CommonResp: &pbOffice.CommonResp{}, CommonResp: &pbOffice.CommonResp{},
Tags: []*pbOffice.Tag{}, //Tags: []*pbOffice.Tag{},
} }
resp.Tags = make([]*pbOffice.Tag, 0)
tags, err := db.DB.GetUserTags(req.UserID) tags, err := db.DB.GetUserTags(req.UserID)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserTags failed", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserTags failed", err.Error())
@ -216,8 +217,9 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen
CurrentPage: req.Pagination.PageNumber, CurrentPage: req.Pagination.PageNumber,
ShowNumber: req.Pagination.ShowNumber, ShowNumber: req.Pagination.ShowNumber,
}, },
TagSendLogs: []*pbOffice.TagSendLog{}, //TagSendLogs: []*pbOffice.TagSendLog{},
} }
resp.TagSendLogs = make([]*pbOffice.TagSendLog, 0)
tagSendLogs, err := db.DB.GetTagSendLogs(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) tagSendLogs, err := db.DB.GetTagSendLogs(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTagSendLogs", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTagSendLogs", err.Error())
@ -234,7 +236,10 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen
func (s *officeServer) GetUserTagByID(_ context.Context, req *pbOffice.GetUserTagByIDReq) (resp *pbOffice.GetUserTagByIDResp, err error) { func (s *officeServer) GetUserTagByID(_ context.Context, req *pbOffice.GetUserTagByIDReq) (resp *pbOffice.GetUserTagByIDResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp = &pbOffice.GetUserTagByIDResp{CommonResp: &pbOffice.CommonResp{}, Tag: &pbOffice.Tag{}} resp = &pbOffice.GetUserTagByIDResp{
CommonResp: &pbOffice.CommonResp{},
Tag: &pbOffice.Tag{},
}
tag, err := db.DB.GetTagByID(req.UserID, req.TagID) tag, err := db.DB.GetTagByID(req.UserID, req.TagID)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTagByID failed", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTagByID failed", err.Error())