Roc 1 ano atrás
pai
commit
37021cd161
2 arquivos alterados com 8 adições e 1 exclusões
  1. 4 1
      controllers/excel_info.go
  2. 4 0
      services/data/table/mixed_table.go

+ 4 - 1
controllers/excel_info.go

@@ -110,9 +110,12 @@ func (this *ExcelInfoController) GetTableDetail() {
 			br.ErrMsg = "表格json转结构体失败,Err:" + err.Error()
 			return
 		}
-		newResult, tmpErr, _ := table.GetMixedTableCellData(result)
+		newResult, tmpErr, tmpErrMsg := table.GetMixedTableCellData(result)
 		if tmpErr != nil {
 			br.Msg = "获取失败"
+			if tmpErrMsg != `` {
+				br.Msg = tmpErrMsg
+			}
 			br.ErrMsg = "获取最新的数据失败,Err:" + tmpErr.Error()
 			return
 		}

+ 4 - 0
services/data/table/mixed_table.go

@@ -368,6 +368,10 @@ func getCalculateValueByCell(calculateCellMap map[string]Cell, key string, cellK
 	tagList := make([]utils.CellPosition, 0)
 	// 计算单元格relationCellList
 	var relationCellList []request.RelationCell
+	if colData.Extra == `` {
+		err = errors.New(colData.Uid + "没有绑定关系")
+		return
+	}
 	err = json.Unmarshal([]byte(colData.Extra), &relationCellList)
 	if err != nil {
 		return