From c3bccab0ae1b4bc0280623ff2659fe05e3935ff6 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 17 Nov 2022 11:13:24 +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

---
 routers/api/v1/repo/cloudbrain.go | 20 +++++++++++++-------
 routers/api/v1/repo/modelarts.go  | 19 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 53eaf28c6..07ce7854d 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -204,18 +204,24 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 	//     "$ref": "#/responses/Label"
 
 	var (
+		job *models.Cloudbrain
 		err error
 	)
 
 	ID := ctx.Params(":id")
-	job, err := models.GetCloudbrainByID(ID)
-	if err != nil {
+
+	_, err = strconv.ParseInt(ID, 10, 64)
+	if err!=nil{
+
 		job, err = models.GetCloudbrainByJobID(ID)
-		if err != nil {
-			ctx.NotFound(err)
-			log.Error("GetCloudbrainByID failed:", err)
-			return
-		}
+	}else{
+		job, err = models.GetCloudbrainByID(ID)
+
+	}
+
+	if err != nil {
+		ctx.NotFound(err)
+		return
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
 		routerRepo.GetAiSafetyTaskByJob(job)
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index d9426749f..1e1a176e5 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -33,18 +33,25 @@ import (
 
 func GetModelArtsNotebook2(ctx *context.APIContext) {
 	var (
+		job *models.Cloudbrain
 		err error
 	)
 
 	ID := ctx.Params(":id")
-	job, err := models.GetCloudbrainByID(ID)
-	if err != nil {
+
+	_, err = strconv.ParseInt(ID, 10, 64)
+	if err!=nil{
 		job, err = models.GetCloudbrainByJobID(ID)
-		if err != nil {
-			ctx.NotFound(err)
-			return
-		}
+	}else{
+		job, err = models.GetCloudbrainByID(ID)
+
 	}
+
+	if err != nil {
+		ctx.NotFound(err)
+		return
+	}
+
 	err = modelarts.HandleNotebookInfo(job)
 	if err != nil {
 		ctx.NotFound(err)