作者 RuoYi

优化导出对象的子列表判断条件

@@ -993,7 +993,7 @@ public class ExcelUtil<T> @@ -993,7 +993,7 @@ public class ExcelUtil<T>
993 { 993 {
994 // 创建cell 994 // 创建cell
995 cell = row.createCell(column); 995 cell = row.createCell(column);
996 - if (isSubListValue(vo) && attr.needMerge()) 996 + if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
997 { 997 {
998 CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column); 998 CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
999 sheet.addMergedRegion(cellAddress); 999 sheet.addMergedRegion(cellAddress);