Browse Source

图表名称错误bug

xyxie 9 months ago
parent
commit
3db97fa625
2 changed files with 8 additions and 4 deletions
  1. 5 3
      services/data/chart_info_excel_balance.go
  2. 3 1
      services/data/excel/balance_table.go

+ 5 - 3
services/data/chart_info_excel_balance.go

@@ -111,7 +111,9 @@ func AddBalanceExcelChart(excelInfo *excelModel.ExcelInfo, req request.AddBalanc
 	}
 	chartInfo, err, errMsg, isSendEmail = addBalanceExcelChart(req, sysUser.AdminId, sysUser.RealName)
 	if err != nil {
-		errMsg = "新增图表失败!"
+		if errMsg == "" {
+			errMsg = "新增图表失败!"
+		}
 		err = fmt.Errorf("新增图表失败!%s, %s", errMsg, err.Error())
 		return
 	}
@@ -203,7 +205,7 @@ func addBalanceExcelChart(req request.AddBalanceTableChartReq, sysUserId int, sy
 	}
 
 	if count > 0 {
-		errMsg = "图表已存在,请重新填写"
+		errMsg = "图表名称已存在,请重新填写"
 		err = fmt.Errorf("判断图表名称是否存在失败")
 		isSendEmail = false
 		return
@@ -503,7 +505,7 @@ func editBalanceExcelChart(req request.AddBalanceTableChartReq) (chartInfo *data
 	}
 
 	if count > 0 {
-		errMsg = "图表已存在,请重新填写"
+		errMsg = "图表名称已存在,请重新填写"
 		err = fmt.Errorf("判断图表名称是否存在失败")
 		isSendEmail = false
 		return

+ 3 - 1
services/data/excel/balance_table.go

@@ -31,7 +31,7 @@ func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo, lang string) (newDat
 		return
 	}
 
-	allRows = len(newData)
+	allRows = len(newData) + 1
 	allCols = 0
 	newDataMap = make(map[int]map[int]request.MixedTableCellDataReq)
 	for r, row := range newData {
@@ -45,6 +45,8 @@ func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo, lang string) (newDat
 		}
 		newDataMap[r] = colMap
 	}
+	allRows += 1
+	allCols += 1
 	return
 }