Merge branch 'hotfix/custom_balance_table' into debug

# Conflicts:
#	services/data/excel/balance_table.go

services/data/excel/balance_table.go

@@ -538,12 +538,11 @@ func SyncBalanceEdbData(excelInfo *excelModel.ExcelInfo, balanceTableData [][]re
 
 	for _, mapping := range tmpMappingList {
 		excelEdbMap[mapping.ExcelChartEdbId] = mapping
-		_, _ = GetBalanceExcelEdbData(mapping, newExcelDataMap, excelDataMap, excelAllRows, excelAllCols)
-		// 如果未正常获取到数据，则该条数据不展示
-		/*if err != nil {
-			err = fmt.Errorf(" 获取图表，指标信息失败 Err:%s", err.Error())
-			return
-		}*/
+		er, msg := GetBalanceExcelEdbData(mapping, newExcelDataMap, excelDataMap, excelAllRows, excelAllCols)
+		if er != nil {
+			utils.FileLog.Info(fmt.Sprintf(" 获取图表，指标信息失败 Err:%s, %s", msg, er.Error()))
+			continue
+		}
 	}
 	// 批量更新图表数据
 	err = excelModel.BatchUpdateChartEdbData(excelInfo.ExcelInfoId, excelEdbMap, excelDataMap)