Browse Source

fix:卓创红期错误提示

zqbao 7 months ago
parent
commit
8ad222d6ab
2 changed files with 12 additions and 8 deletions
  1. 5 1
      controllers/data_manage/sci_hq_data.go
  2. 7 7
      services/data/base_from_sci_hq.go

+ 5 - 1
controllers/data_manage/sci_hq_data.go

@@ -93,13 +93,17 @@ func (this *SciHqDataController) AddClassify() {
 		br.Msg = "操作异常"
 		return
 	}
-	ok, err := data.AddSciHqClassify(req.ClassifyName, this.Lang, req.ParentId)
+	ok, msg, err := data.AddSciHqClassify(req.ClassifyName, this.Lang, req.ParentId)
 	if err != nil {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
 	}
 	if !ok {
+		if msg != "" {
+			br.Msg = msg
+			return
+		}
 		br.Msg = "添加失败"
 		return
 	}

+ 7 - 7
services/data/base_from_sci_hq.go

@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-func AddSciHqClassify(classifyName, lang string, parentId int) (ok bool, err error) {
+func AddSciHqClassify(classifyName, lang string, parentId int) (ok bool, msg string, err error) {
 	var count int
 	switch lang {
 	case utils.EnLangVersion:
@@ -20,20 +20,20 @@ func AddSciHqClassify(classifyName, lang string, parentId int) (ok bool, err err
 		return
 	}
 	if count > 0 {
-		return false, errors.New("分类已存在")
+		return false, "分类已存在", nil
 	}
 
 	sort, err := data_manage.GetChildSciHqClassifyMaxSortById(parentId)
 	if err != nil {
-		return false, err
+		return false, "", err
 	}
 	if parentId > 0 {
 		count, err = data_manage.GetSciHqClassifyCountById(parentId)
 		if err != nil {
-			return false, err
+			return false, "", err
 		}
 		if count == 0 {
-			return false, errors.New("父分类不存在")
+			return false, "", errors.New("父分类不存在")
 		}
 		sciHqClassify := &data_manage.BaseFromSciHqClassify{
 			ClassifyName:   classifyName,
@@ -60,7 +60,7 @@ func AddSciHqClassify(classifyName, lang string, parentId int) (ok bool, err err
 		}
 		insertId, er := sciHqClassify.Add()
 		if er != nil {
-			return false, er
+			return false, "", er
 		}
 		sciHqClassifyList := []*data_manage.BaseFromSciHqClassify{
 			{
@@ -105,7 +105,7 @@ func AddSciHqClassify(classifyName, lang string, parentId int) (ok bool, err err
 			return
 		}
 	}
-	return true, nil
+	return true, "", nil
 }
 
 func DelSciHqClassify(classifyId int) (err error) {