浏览代码

Merge branch 'ETA_2.4.0' into debug

xiziwen 3 月之前
父节点
当前提交
b2fd4af54a
共有 3 个文件被更改,包括 21 次插入15 次删除
  1. 7 5
      controllers/english_report/report.go
  2. 7 5
      controllers/ppt_english.go
  3. 7 5
      controllers/ppt_v2.go

+ 7 - 5
controllers/english_report/report.go

@@ -158,11 +158,13 @@ func (this *EnglishReportController) Add() {
 		}
 		excelReferences = append(excelReferences, &refItem)
 	}
-	err = excel.AddReferencedExcelConfig(excelReferences)
-	if err != nil {
-		br.Msg = "新增引用失败"
-		br.ErrMsg = "新增引用失败,Err:" + err.Error()
-		return
+	if len(excelReferences) > 0 {
+		err = excel.AddReferencedExcelConfig(excelReferences)
+		if err != nil {
+			br.Msg = "新增引用失败"
+			br.ErrMsg = "新增引用失败,Err:" + err.Error()
+			return
+		}
 	}
 
 	resp := new(models.AddEnglishReportResp)

+ 7 - 5
controllers/ppt_english.go

@@ -208,11 +208,13 @@ func (this *PptEnglishController) AddPpt() {
 			}
 			excelReferences = append(excelReferences, &refItem)
 		}
-		err = excel.AddReferencedExcelConfig(excelReferences)
-		if err != nil {
-			br.Msg = "新增引用失败"
-			br.ErrMsg = "新增引用失败,Err:" + err.Error()
-			return
+		if len(excelReferences) > 0 {
+			err = excel.AddReferencedExcelConfig(excelReferences)
+			if err != nil {
+				br.Msg = "新增引用失败"
+				br.ErrMsg = "新增引用失败,Err:" + err.Error()
+				return
+			}
 		}
 	} else {
 		newId = req.PptId

+ 7 - 5
controllers/ppt_v2.go

@@ -211,11 +211,13 @@ func (this *PptV2Controller) AddPpt() {
 			}
 			excelReferences = append(excelReferences, &refItem)
 		}
-		err = excel.AddReferencedExcelConfig(excelReferences)
-		if err != nil {
-			br.Msg = "新增引用失败"
-			br.ErrMsg = "新增引用失败,Err:" + err.Error()
-			return
+		if len(excelReferences) > 0 {
+			err = excel.AddReferencedExcelConfig(excelReferences)
+			if err != nil {
+				br.Msg = "新增引用失败"
+				br.ErrMsg = "新增引用失败,Err:" + err.Error()
+				return
+			}
 		}
 	} else {
 		newId = req.PptId