导入excel，批量取消邮寄

src/main/java/com/yxproject/start/utils/ExportExcel.java

@@ -384,19 +384,22 @@ public  class ExportExcel {
 
                 String[] s = new String[headerNum];
                 for (int o = 0; o < headerNum; o++){
-                    Cell headerCell = sheet.getRow(0).getCell(o);
-                    headerCell.setCellType(CellType.STRING);
+                    Cell headerCell = sheet.getRow(2).getCell(o);
+//                    headerCell.setCellType(CellType.STRING);
                     s[o] = headerCell.getStringCellValue();
                 }
                 // sheet.getRows()返回该页的总行数
-                for (int nowRowNum = 3; nowRowNum < rowNum-2 ; nowRowNum++) {
+                for (int nowRowNum = 3; nowRowNum <= rowNum ; nowRowNum++) {
                     Map<String,Object> map = new HashMap<>();
                     Row row = sheet.getRow(nowRowNum);
                     // sheet.getColumns()返回该页的总列数
                     int columnNum = row.getLastCellNum();
                     for (int nowColumnNum = 0; nowColumnNum < columnNum; nowColumnNum++) {
                         Cell columnCell = sheet.getRow(nowRowNum).getCell(nowColumnNum);
-                        columnCell.setCellType(CellType.STRING);
+//                        columnCell.setCellType(CellType.STRING);
+                        if (ObjectUtils.isEmpty(columnCell)){
+                            continue;
+                        }else {
                             String cellinfo = columnCell.getStringCellValue();
                             if(cellinfo.isEmpty() || cellinfo.equals("")){
                                 continue;
@@ -404,6 +407,7 @@ public  class ExportExcel {
                                 map.put(s[nowColumnNum],cellinfo);
                             }
                         }
+                    }
                     if (!ObjectUtils.isEmpty(map)){
                         outerList.add(map);
                     }