From 3ee355d2d320c25c308d882aeed7ec65ee5449d1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 5 Nov 2021 11:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       | 13 +++++++++----
 routers/repo/ai_model_manage.go | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index d17c517b8..bdb9efb40 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -56,14 +56,19 @@ func SaveModelToDb(model *AiModelManage) error {
 	return nil
 }
 
-func QueryModelById(id string) AiModelManage {
+func QueryModelById(id string) (*AiModelManage, error) {
 	sess := x.NewSession()
 	defer sess.Close()
 	sess.Select("*").Table("ai_model_manage").
 		Where("id='" + id + "'")
-	var aiModelManage AiModelManage
-	sess.Find(&aiModelManage)
-	return aiModelManage
+	aiModelManageList := make([]*AiModelManage, 0)
+	err := sess.Find(&aiModelManageList)
+	if err != nil {
+		if len(aiModelManageList) == 1 {
+			return aiModelManageList[0], nil
+		}
+	}
+	return nil, err
 }
 
 func DeleteModelById(id string) error {
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index e1a5022fb..859a2f7b8 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -135,14 +135,17 @@ func DeleteModel(ctx *context.Context) {
 func DeleteModelByID(id string) error {
 	log.Info("delete model start. id=" + id)
 
-	model := models.QueryModelById(id)
-	log.Info("bucket=" + setting.Bucket + " path=" + model.Path)
-	//err := storage.ObsRemoveObject(setting.Bucket, model.Path)
-	//if err != nil {
-	//	log.Info("Failed to delete model. id=" + id)
-	//	return err
-	//}
-	return models.DeleteModelById(id)
+	model, err := models.QueryModelById(id)
+	if err == nil {
+		log.Info("bucket=" + setting.Bucket + " path=" + model.Path)
+		//err := storage.ObsRemoveObject(setting.Bucket, model.Path)
+		//if err != nil {
+		//	log.Info("Failed to delete model. id=" + id)
+		//	return err
+		//}
+		return models.DeleteModelById(id)
+	}
+	return err
 }
 
 func DownloadModel(ctx *context.Context) {