Merge branch 'hotfix/custom_balance_table' into debug

controllers/data_manage/excel/balance_table.go

@@ -1103,7 +1103,8 @@ func (c *ExcelInfoController) AddStaticExcel() {
 		}
 		tmpMappingList, e := excel.GetExcelChartEdbMappingByExcelInfoId(childExcelInfo.ExcelInfoId)
 		if e != nil {
-			err = fmt.Errorf(" 获取图表，指标信息失败 Err:%s", err.Error())
+			br.Msg = "获取图表，指标信息失败"
+			br.ErrMsg = fmt.Sprintf(" 获取图表，指标信息失败 Err:%s", err.Error())
 			return
 		}
 		if len(tmpMappingList) > 0 {
@@ -1112,10 +1113,10 @@ func (c *ExcelInfoController) AddStaticExcel() {
 				if !ok {
 					child = make(map[int][]*data_manage.EdbDataList)
 				}
-				err, errMsg = excelService.GetBalanceExcelEdbData(mapping, newExcelDataMap, child, excelAllRows, excelAllCols)
-				if err != nil {
-					err = fmt.Errorf(" 获取图表，指标信息失败 Err:%s", err.Error())
-					return
+				er, msg := excelService.GetBalanceExcelEdbData(mapping, newExcelDataMap, child, excelAllRows, excelAllCols)
+				if er != nil {
+					utils.FileLog.Info(fmt.Sprintf(" 获取图表，指标信息失败 Err:%s, %s", msg, er.Error()))
+					continue
 				}
 				excelDataMap[mapping.ChartInfoId] = child
 			}