فهرست منبع

张丁 修复 目标回顾导入报错

zhangding 3 سال پیش
والد
کامیت
f14977ea82
1فایلهای تغییر یافته به همراه12 افزوده شده و 4 حذف شده
  1. 12 4
      master/src/main/java/com/ruoyi/project/plant/controller/TTargetreviewController.java

+ 12 - 4
master/src/main/java/com/ruoyi/project/plant/controller/TTargetreviewController.java

@@ -182,17 +182,25 @@ public class TTargetreviewController extends BaseController
         List<SysDictData> plant = iSysDictTypeService.selectDictDataByType("PLANT_DIVIDE");
         //部门查询
         List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
-        int rowNum = sheet.getPhysicalNumberOfRows();
+        int rowNum = sheet.getLastRowNum();
         int failNumber = 0;
-        for (int i = 1; i < rowNum; i++) {
+        for (int i = 1; i <= rowNum; i++) {
             try {
                 logger.info("读取行数:" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+            //    int cellNum = row.getPhysicalNumberOfCells();
+                if(row==null){
+                    sheet.removeRow(row);
+                    rowNum++;
+                    continue;
+                }
+                int cellNum = row.getLastCellNum();
                 TTargetreview entity = new TTargetreview();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
-                    cell.setCellType(CellType.STRING);
+                    if (cell == null) {
+                        continue;
+                    }
                     String cellValue = ExcelUtils.getCellValue(cell);
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {