From 77c61200141579ad78516900be5f214708c3cc69 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 1 Apr 2022 15:32:24 +0800
Subject: [PATCH] null to empty slice

---
 internal/rpc/office/office.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go
index ad394f3bc..bab3ff924 100644
--- a/internal/rpc/office/office.go
+++ b/internal/rpc/office/office.go
@@ -70,8 +70,9 @@ func (s *officeServer) GetUserTags(_ context.Context, req *pbOffice.GetUserTagsR
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req ", req.String())
 	resp = &pbOffice.GetUserTagsResp{
 		CommonResp: &pbOffice.CommonResp{},
-		Tags:       []*pbOffice.Tag{},
+		//Tags:       []*pbOffice.Tag{},
 	}
+	resp.Tags = make([]*pbOffice.Tag, 0)
 	tags, err := db.DB.GetUserTags(req.UserID)
 	if err != nil {
 		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,
 			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)
 	if err != nil {
 		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) {
 	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)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTagByID failed", err.Error())