From 0c7db4d68993e512712281b071dded951e542413 Mon Sep 17 00:00:00 2001 From: golangboy Date: Fri, 19 May 2023 13:53:46 +0800 Subject: [PATCH] fix: filter private journal --- handler/content/model/journal.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/handler/content/model/journal.go b/handler/content/model/journal.go index 6ea7cebe..0b48745d 100644 --- a/handler/content/model/journal.go +++ b/handler/content/model/journal.go @@ -2,6 +2,7 @@ package model import ( "context" + "github.com/go-sonic/sonic/consts" "github.com/go-sonic/sonic/model/dto" "github.com/go-sonic/sonic/model/param" @@ -29,14 +30,15 @@ type JournalModel struct { func (p *JournalModel) Journals(ctx context.Context, model template.Model, page int) (string, error) { pageSize := p.OptionService.GetOrByDefault(ctx, property.JournalPageSize).(int) - journals, total, err := p.JournalService.Page(ctx, - param.Page{ - PageNum: page, - PageSize: pageSize, - }, - ¶m.Sort{ + journalType := consts.JournalTypePublic + journals, total, err := p.JournalService.ListJournal(ctx, param.JournalQuery{ + Page: param.Page{PageNum: page, PageSize: pageSize}, + Sort: ¶m.Sort{ Fields: []string{"createTime,desc"}, - }) + }, + Keyword: nil, + JournalType: &journalType, + }) if err != nil { return "", err }