diff --git a/internal/service/siteinfo/siteinfo_service.go b/internal/service/siteinfo/siteinfo_service.go index 0f93f0fd..e940bb22 100644 --- a/internal/service/siteinfo/siteinfo_service.go +++ b/internal/service/siteinfo/siteinfo_service.go @@ -87,18 +87,17 @@ func (s *SiteInfoService) GetSiteWrite(ctx context.Context) (resp *schema.SiteWr log.Error(err) return resp, nil } - if !exist { - return resp, nil + if exist { + _ = json.Unmarshal([]byte(siteInfo.Content), resp) } - _ = json.Unmarshal([]byte(siteInfo.Content), resp) resp.RecommendTags, err = s.tagCommonService.GetSiteWriteRecommendTag(ctx) if err != nil { - return nil, err + log.Error(err) } resp.ReservedTags, err = s.tagCommonService.GetSiteWriteReservedTag(ctx) if err != nil { - return nil, err + log.Error(err) } return resp, nil } diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go index ec67720a..42a156a7 100644 --- a/internal/service/tag_common/tag_common.go +++ b/internal/service/tag_common/tag_common.go @@ -82,6 +82,9 @@ func (ts *TagCommonService) SearchTagLike(ctx context.Context, req *schema.Searc func (ts *TagCommonService) GetSiteWriteRecommendTag(ctx context.Context) (tags []string, err error) { tags = make([]string, 0) list, err := ts.tagCommonRepo.GetRecommendTagList(ctx) + if err != nil { + return tags, err + } for _, item := range list { tags = append(tags, item.SlugName) } @@ -124,6 +127,9 @@ func (ts *TagCommonService) SetSiteWriteTag(ctx context.Context, recommendTags, func (ts *TagCommonService) GetSiteWriteReservedTag(ctx context.Context) (tags []string, err error) { tags = make([]string, 0) list, err := ts.tagCommonRepo.GetReservedTagList(ctx) + if err != nil { + return tags, err + } for _, item := range list { tags = append(tags, item.SlugName) }