diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index cf6a7f069..1e391ba12 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -154,7 +154,7 @@ func (s *userServer) GetPaginationUsers(ctx context.Context, req *pbuser.GetPagi } resp.Total = int32(total) resp.Users, err = (*convert.DBUser)(nil).DB2PB(usersDB) - return resp, nil + return resp, err } // ok diff --git a/pkg/common/db/cache/rockscache.go b/pkg/common/db/cache/rockscache.go index ea1500845..7c6a43bed 100644 --- a/pkg/common/db/cache/rockscache.go +++ b/pkg/common/db/cache/rockscache.go @@ -110,12 +110,14 @@ func batchGetCache[T any](ctx context.Context, rcClient *rockscache.Client, keys return nil, err } for _, v := range batchMap { - var t T - err = json.Unmarshal([]byte(v), &t) - if err != nil { - return nil, utils.Wrap(err, "unmarshal failed") + if v != "" { + var t T + err = json.Unmarshal([]byte(v), &t) + if err != nil { + return nil, utils.Wrap(err, "unmarshal failed") + } + tArrays = append(tArrays, t) } - tArrays = append(tArrays, t) } return tArrays, nil }