Merge branch 'V20220630' of git.openi.org.cn:OpenI/aiforge into grampus

models/dataset.go

@@ -181,6 +181,7 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
 	if len(opts.DatasetIDs) > 0 {
 		subCon := builder.NewCond()
 		subCon = subCon.And(builder.In("dataset.id", opts.DatasetIDs))
+		subCon = generateFilterCond(opts, subCon)
 		cond = cond.Or(subCon)
 	}
 
@@ -460,5 +461,12 @@ func GetCollaboratorDatasetIdsByUserID(userID int64) []int64 {
 	_ = x.Table("dataset").Join("INNER", "collaboration", "dataset.repo_id = collaboration.repo_id and collaboration.mode>0 and collaboration.user_id=?", userID).
 		Cols("dataset.id").Find(&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
 }

routers/home.go

@@ -346,7 +346,9 @@ func ExploreDatasets(ctx *context.Context) {
 	var datasetsIds []int64
 	if ownerID > 0 {
 
-		datasetsIds = models.GetCollaboratorDatasetIdsByUserID(ownerID)
+		collaboratorDatasetsIds := models.GetCollaboratorDatasetIdsByUserID(ownerID)
+		teamDatasetsIds := models.GetTeamDatasetIdsByUserID(ownerID)
+		datasetsIds = append(collaboratorDatasetsIds, teamDatasetsIds...)
 	}
 
 	opts := &models.SearchDatasetOptions{