From cf3fd3306e949d97070563d501da3cabc5837f7d Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 19 Jan 2022 18:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/repo/cloudbrain.go |  4 +++-
 routers/repo/modelarts.go  | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index ba2619857..dd78e8399 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -163,6 +163,8 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	resourceSpecId := form.ResourceSpecId
 
 	//检查任务名称是否重复
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeDebug))
 	tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			PageSize: setting.UI.IssuePagingNum,
@@ -170,7 +172,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 		RepoID:     ctx.Repo.Repository.ID,
 		Type:       -1,
 		JobTypeNot: false,
-		JobType:    string(models.JobTypeDebug),
+		JobTypes:   jobTypes,
 	})
 	if err == nil {
 		for _, task := range tasks {
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 195b992d7..f57aa2bdc 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -135,7 +135,9 @@ func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm)
 	uuid := form.Attachment
 	description := form.Description
 	flavor := form.Flavor
-
+	//判断任务名是否重名
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeDebug))
 	tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			PageSize: setting.UI.IssuePagingNum,
@@ -143,7 +145,7 @@ func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm)
 		RepoID:     ctx.Repo.Repository.ID,
 		Type:       -1,
 		JobTypeNot: false,
-		JobType:    string(models.JobTypeDebug),
+		JobTypes:   jobTypes,
 	})
 	if err == nil {
 		for _, task := range tasks {
@@ -803,6 +805,8 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 	}
 
 	//判断项目内任务名称是否重复
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			PageSize: setting.UI.IssuePagingNum,
@@ -810,7 +814,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		RepoID:          repo.ID,
 		Type:            models.TypeCloudBrainTwo,
 		JobTypeNot:      false,
-		JobType:         string(models.JobTypeTrain),
+		JobTypes:        jobTypes,
 		IsLatestVersion: modelarts.IsLatestVersion,
 	})
 	if err == nil {
@@ -1640,13 +1644,15 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		return
 	}
 
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeInference))
 	tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			PageSize: setting.UI.IssuePagingNum,
 		},
-		RepoID:  repo.ID,
-		Type:    models.TypeCloudBrainTwo,
-		JobType: string(models.JobTypeInference),
+		RepoID:   repo.ID,
+		Type:     models.TypeCloudBrainTwo,
+		JobTypes: jobTypes,
 	})
 
 	if err == nil {