|
@@ -302,8 +302,10 @@ public class ExcelUtils {
|
|
|
}
|
|
}
|
|
|
row.setHeight((short) 600);
|
|
row.setHeight((short) 600);
|
|
|
ExcelUtils.getCellByRow(row, 0, cellStyleTop, downFileName);
|
|
ExcelUtils.getCellByRow(row, 0, cellStyleTop, downFileName);
|
|
|
- CellRangeAddress region = new CellRangeAddress(0, 0, 0, tds.size() - 1);
|
|
|
|
|
- newSheet.addMergedRegion(region);
|
|
|
|
|
|
|
+ if (ObjectUtils.isNotEmpty(tds) && tds.size() > 1) {
|
|
|
|
|
+ CellRangeAddress region = new CellRangeAddress(0, 0, 0, tds.size() - 1);
|
|
|
|
|
+ newSheet.addMergedRegion(region);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
XSSFCellStyle cellStyle = wb.createCellStyle();
|
|
XSSFCellStyle cellStyle = wb.createCellStyle();
|