Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.22.6.2
zouap 3 years ago
parent
commit
3988538ea4
2 changed files with 1 additions and 12 deletions
  1. +0
    -9
      models/dataset.go
  2. +1
    -3
      routers/home.go

+ 0
- 9
models/dataset.go View File

@@ -181,7 +181,6 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
if len(opts.DatasetIDs) > 0 { if len(opts.DatasetIDs) > 0 {
subCon := builder.NewCond() subCon := builder.NewCond()
subCon = subCon.And(builder.In("dataset.id", opts.DatasetIDs)) subCon = subCon.And(builder.In("dataset.id", opts.DatasetIDs))
subCon = generateFilterCond(opts, subCon)
cond = cond.Or(subCon) cond = cond.Or(subCon)
} }


@@ -462,11 +461,3 @@ func GetCollaboratorDatasetIdsByUserID(userID int64) []int64 {
Cols("dataset.id").Find(&datasets) Cols("dataset.id").Find(&datasets)
return datasets return datasets
} }

func GetTeamDatasetIdsByUserID(userID int64) []int64 {
var datasets []int64
_ = x.Table("dataset").Join("INNER", "team_repo", "dataset.repo_id = team_repo.repo_id").
Join("INNER", "team_user", "team_repo.team_id=team_user.team_id and team_user.uid=?", userID).
Cols("dataset.id").Find(&datasets)
return datasets
}

+ 1
- 3
routers/home.go View File

@@ -345,9 +345,7 @@ func ExploreDatasets(ctx *context.Context) {
var datasetsIds []int64 var datasetsIds []int64
if ownerID > 0 { if ownerID > 0 {


collaboratorDatasetsIds := models.GetCollaboratorDatasetIdsByUserID(ownerID)
teamDatasetsIds := models.GetTeamDatasetIdsByUserID(ownerID)
datasetsIds = append(collaboratorDatasetsIds, teamDatasetsIds...)
datasetsIds = models.GetCollaboratorDatasetIdsByUserID(ownerID)
} }


opts := &models.SearchDatasetOptions{ opts := &models.SearchDatasetOptions{


Loading…
Cancel
Save