Merge branch 'feature/eta1.8.5_excel_balance' into debug

controllers/data_manage/excel/balance_table.go

@@ -631,9 +631,9 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 			return
 		}
 
-		for _, mapping := range req.ChartEdbInfoList {
+		for k, mapping := range req.ChartEdbInfoList {
 			tmpMapping := &excel.ExcelChartEdb{
-				ExcelChartEdbId: mapping.ExcelChartEdbId,
+				ExcelChartEdbId: k,
 				DateSequence:    mapping.DateSequenceStr,
 				DataSequence:    mapping.DataSequenceStr,
 			}

services/data/chart_info_excel_balance.go

@@ -371,11 +371,10 @@ func EditBalanceExcelChart(excelInfo *excelModel.ExcelInfo, req request.AddBalan
 
 		var dataList []*excelModel.ExcelChartData
 		if excelInfo.BalanceType == 1 {
-			// 如果是静态表，则直接使用前端传输的数据落到数据库里
 			tmpList, ok := dataListMap[k]
 			if !ok {
 				errMsg = "查询图表数据失败！"
-				err = fmt.Errorf("查询图表数据失败！%s", err.Error())
+				err = fmt.Errorf("查询图表数据失败！")
 				return
 			}
 			for _, l := range tmpList {