@@ -66,9 +66,9 @@ public static <T> List<T> toList(Workbook book, Class<T> clazz, Predicate<T> val
66
66
// 获取映射
67
67
ExcelMapping mapping = ExcelMapping .getMapping (clazz );
68
68
69
- // 获取数据实际的起始行号
69
+ // 获取数据实际的起止行号
70
70
int rowStart = sheet .getFirstRowNum ();
71
- int rowEnd = sheet .getLastRowNum () ;
71
+ int rowEnd = sheet .getPhysicalNumberOfRows () - 1 ;
72
72
while (ExcelRowUtils .isEmptyRow (sheet .getRow (rowStart ))) {
73
73
rowStart ++; // 过滤起始的空行
74
74
}
@@ -179,7 +179,7 @@ public static boolean getHasNumberCell(Sheet sheet, ExcelMapping mapping) {
179
179
Row row ;
180
180
Cell cell ;
181
181
Object cellValue ;
182
- for (int i = 0 ; i <= sheet .getLastRowNum () ; i ++) {
182
+ for (int i = 0 ; i <= sheet .getPhysicalNumberOfRows () - 1 ; i ++) {
183
183
row = sheet .getRow (i );
184
184
if (ExcelRowUtils .isEmptyRow (row )) {
185
185
continue ;
@@ -209,9 +209,9 @@ public static boolean getHasNumberCell(Sheet sheet, ExcelMapping mapping) {
209
209
*/
210
210
@ Nullable
211
211
private static Integer findHeadRowNum (Sheet sheet , int firstRowNum , ExcelMapping mapping ) {
212
- // 只检测5行
212
+ // 只检测前3行
213
213
int i = 0 ;
214
- while (i < 5 ) {
214
+ while (i < 3 ) {
215
215
Row row = sheet .getRow (firstRowNum + i );
216
216
if (row != null && ExcelRowUtils .isHeadRow (row , mapping )) {
217
217
return row .getRowNum ();
@@ -268,7 +268,7 @@ public static Workbook toExcel(List<?> dataList, Class<?> clazz) {
268
268
ListToExcelHookTrigger .onBeforeCreateHeadRow (sheet , mapping );
269
269
270
270
// 除去自定义行以外的首行
271
- int firstRowNum = sheet .getLastRowNum () + 1 ;
271
+ int firstRowNum = sheet .getPhysicalNumberOfRows () ;
272
272
// 创建头行
273
273
ExcelRowUtils .createHeadRow (sheet , mapping );
274
274
// 创建数据行
@@ -277,7 +277,7 @@ public static Workbook toExcel(List<?> dataList, Class<?> clazz) {
277
277
// 触发勾子:afterCreateDataRows
278
278
ListToExcelHookTrigger .onAfterCreateDataRows (sheet , mapping );
279
279
280
- // 写文件后 ,设置样式:如自适应宽度等
280
+ // 表格内容填充完后 ,设置样式:如自适应宽度等
281
281
ExcelCellUtils .setCellStyle (sheet , mapping , firstRowNum , false );
282
282
} catch (Exception e ) {
283
283
try {
0 commit comments