浏览代码

Merge branch 'bzq/6665_excel_bug' of eta_gn_server/eta_api into debug

baoziqiang 4 月之前
父节点
当前提交
8059fa6468
共有 1 个文件被更改,包括 0 次插入3 次删除
  1. 0 3
      services/excel/lucky_sheet.go

+ 0 - 3
services/excel/lucky_sheet.go

@@ -1728,9 +1728,6 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 	if err != nil {
 	if err != nil {
 		return
 		return
 	}
 	}
-	if len(excelRuleMappingList) == 0 {
-		return
-	}
 	excelRuleMap := make(map[int]*excel.ExcelInfoRuleMappingView)
 	excelRuleMap := make(map[int]*excel.ExcelInfoRuleMappingView)
 	for _, v := range excelRuleMappingList {
 	for _, v := range excelRuleMappingList {
 		excelRuleMap[v.ExcelInfoRuleMappingId] = v
 		excelRuleMap[v.ExcelInfoRuleMappingId] = v