From 91619001595df04efb642b0157ddf6dc381fe424 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Wed, 27 Dec 2023 16:30:06 +0800 Subject: [PATCH] fix: fix the error --- internal/rpc/conversation/conversaion.go | 3 +++ pkg/common/db/controller/msg.go | 2 +- pkg/rpcclient/msg.go | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 7bed9e7f5..b80e32953 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -105,6 +105,9 @@ func (m *conversationServer) GetConversationList(ctx context.Context, req *pbcon if err != nil { return nil, err } + if len(conversations) == 0 { + return nil, errs.ErrRecordNotFound.Wrap() + } maxSeqs, err := m.msgRpcClient.GetMaxSeqs(ctx, conversationIDs) if err != nil { diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index a7a51b558..a7230db00 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -1063,7 +1063,7 @@ func (db *commonMsgDatabase) FindOneByDocIDs(ctx context.Context, conversationID docID := conversationID + ":" + fmt.Sprintf("%d", seq) msgs, err := db.msgDocDatabase.FindOneByDocID(ctx, docID) if err != nil { - return nil, errs.ErrRecordNotFound.Wrap(err.Error()) + return nil, err } totalMsgs[conversationID] = convert.MsgDB2Pb(msgs.Msg[index].Msg) } diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index c0dbd033e..434dc19d0 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -17,7 +17,6 @@ package rpcclient import ( "context" "encoding/json" - "google.golang.org/grpc" "google.golang.org/protobuf/proto"