kobe6258 5 روز پیش
والد
کامیت
237073c3bf
1فایلهای تغییر یافته به همراه6 افزوده شده و 3 حذف شده
  1. 6 3
      controllers/common_info.go

+ 6 - 3
controllers/common_info.go

@@ -1,6 +1,8 @@
 package controllers
 package controllers
 
 
-import "eta/eta_report/models"
+import (
+	"eta/eta_report/models"
+)
 
 
 // CommonController excel表格
 // CommonController excel表格
 type CommonController struct {
 type CommonController struct {
@@ -38,13 +40,14 @@ func (this *CommonController) GetDisclaimer() {
 		br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
 		br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
-	var list []string
+	var list = make(map[string]string, len(disclaimerMap))
 	for _, v := range disclaimerMap {
 	for _, v := range disclaimerMap {
 		if configList[v] == "" {
 		if configList[v] == "" {
 			br.Msg = "获取免责声明失败"
 			br.Msg = "获取免责声明失败"
 			br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
 			br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
+			return
 		}
 		}
-		list = append(list, configList[v])
+		list[v] = configList[v]
 	}
 	}
 	br.Data = list
 	br.Data = list
 	br.Ret = 200
 	br.Ret = 200