From 6af10b01fabcd3bbf7ddd52f9c8f894508d8ec1e Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Mon, 22 Aug 2022 11:04:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/dataset.go | 3 ++- routers/repo/dataset.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/models/dataset.go b/models/dataset.go index 04591c64e..6e34ee093 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -190,6 +190,7 @@ type SearchDatasetOptions struct { JustNeedZipFile bool NeedAttachment bool UploadAttachmentByMe bool + QueryReference bool } func CreateDataset(dataset *Dataset) (err error) { @@ -260,7 +261,7 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond { } } if len(opts.DatasetIDs) > 0 { - if opts.StarByMe { + if opts.StarByMe || (opts.RepoID == 0 && opts.QueryReference) { cond = cond.And(builder.In("dataset.id", opts.DatasetIDs)) } else { subCon := builder.NewCond() diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 51cb4893f..cbfed4666 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -573,7 +573,8 @@ func ReferenceDatasetData(ctx *context.Context) { Page: 1, PageSize: setting.RepoMaxReferenceDatasetNum, }, - SearchOrderBy: getSearchOrderByInValues(datasetIds), + SearchOrderBy: getSearchOrderByInValues(datasetIds), + QueryReference: true, } datasets, _, err := models.SearchDataset(opts)