fix: keep content list tenant filter with keyword
This commit is contained in:
@@ -22,14 +22,14 @@ func (s *content) List(ctx context.Context, tenantID int64, filter *content_dto.
|
|||||||
tbl, q := models.ContentQuery.QueryContext(ctx)
|
tbl, q := models.ContentQuery.QueryContext(ctx)
|
||||||
|
|
||||||
// Filters
|
// Filters
|
||||||
q = q.Where(tbl.Status.Eq(consts.ContentStatusPublished))
|
|
||||||
if tenantID > 0 {
|
|
||||||
q = q.Where(tbl.TenantID.Eq(tenantID))
|
|
||||||
}
|
|
||||||
if filter.Keyword != nil && *filter.Keyword != "" {
|
if filter.Keyword != nil && *filter.Keyword != "" {
|
||||||
keyword := "%" + *filter.Keyword + "%"
|
keyword := "%" + *filter.Keyword + "%"
|
||||||
q = q.Where(tbl.Title.Like(keyword)).Or(tbl.Description.Like(keyword))
|
q = q.Where(tbl.Title.Like(keyword)).Or(tbl.Description.Like(keyword))
|
||||||
}
|
}
|
||||||
|
q = q.Where(tbl.Status.Eq(consts.ContentStatusPublished))
|
||||||
|
if tenantID > 0 {
|
||||||
|
q = q.Where(tbl.TenantID.Eq(tenantID))
|
||||||
|
}
|
||||||
if filter.Genre != nil && *filter.Genre != "" {
|
if filter.Genre != nil && *filter.Genre != "" {
|
||||||
q = q.Where(tbl.Genre.Eq(*filter.Genre))
|
q = q.Where(tbl.Genre.Eq(*filter.Genre))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user