diff --git a/models/attachment.go b/models/attachment.go index 9b0083aaa..913388670 100755 --- a/models/attachment.go +++ b/models/attachment.go @@ -583,7 +583,7 @@ func AttachmentsByDatasetOption(datasets []int64, opts *SearchDatasetOptions) ([ } if opts.UploadAttachmentByMe { cond = cond.And( - builder.Eq{"attachment.uploader_id": opts.OwnerID}, + builder.Eq{"attachment.uploader_id": opts.User.ID}, ) } diff --git a/models/dataset.go b/models/dataset.go index f2f4ef51e..806daec46 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -282,7 +282,7 @@ func generateFilterCond(opts *SearchDatasetOptions, cond builder.Cond) builder.C cond = cond.And(builder.Eq{"attachment.type": opts.CloudBrainType}) } if opts.UploadAttachmentByMe { - cond = cond.And(builder.Eq{"attachment.uploader_id": opts.OwnerID}) + cond = cond.And(builder.Eq{"attachment.uploader_id": opts.User.ID}) } return cond @@ -311,7 +311,8 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da sess.Select(selectColumnsSql).Join("INNER", "repository", "repository.id = dataset.repo_id"). Join("INNER", "attachment", "attachment.dataset_id=dataset.id"). Where(cond).OrderBy(opts.SearchOrderBy.String()) - + a, _ := sess.LastSQL() + log.Warn("dataset sql:" + a) if opts.PageSize > 0 { sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) } diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 97d7a2060..4dde646a6 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -415,14 +415,8 @@ func datasetMultiple(ctx *context.Context, opts *models.SearchDatasetOptions) { cloudbrainType := ctx.QueryInt("type") keyword := strings.Trim(ctx.Query("q"), " ") orderBy := models.SearchOrderByRecentUpdated - var ownerID int64 - if ctx.User != nil { - ownerID = ctx.User.ID - } - opts.Keyword = keyword opts.SearchOrderBy = orderBy - opts.OwnerID = ownerID opts.RecommendOnly = ctx.QueryBool("recommend") opts.CloudBrainType = cloudbrainType opts.ListOptions = models.ListOptions{