diff --git a/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.xlsx b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.xlsx new file mode 100644 index 00000000..025d900e Binary files /dev/null and b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.xlsx differ diff --git a/WebRoot/Excel/2155eba4-188b-46e6-ac01-d01bd63e1415.xlsx b/WebRoot/Excel/2155eba4-188b-46e6-ac01-d01bd63e1415.xlsx new file mode 100644 index 00000000..ddd55d49 Binary files /dev/null and b/WebRoot/Excel/2155eba4-188b-46e6-ac01-d01bd63e1415.xlsx differ diff --git a/WebRoot/Excel/c01ac236-065f-44f8-9291-6a91d9003259.xlsx b/WebRoot/Excel/c01ac236-065f-44f8-9291-6a91d9003259.xlsx new file mode 100644 index 00000000..bc408419 Binary files /dev/null and b/WebRoot/Excel/c01ac236-065f-44f8-9291-6a91d9003259.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 5a42273c..5bbfae9e 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -518,6 +518,7 @@ public class CollectController extends Controller { XSSFWorkbook wb = new XSSFWorkbook(is); //遍历每个Sheet注册好的信息,对用户上传的数据表进行检查 boolean flag = true; + List blankSheet = new ArrayList<>(); for (int i = 0; i < sheetCnt; i++) {//表 //Sheet表 XSSFSheet sheet = wb.getSheetAt(i); @@ -531,6 +532,9 @@ public class CollectController extends Controller { //数据有效行数 int lastRowNum = sheet.getLastRowNum(); + if (data_start_row > lastRowNum) { + blankSheet.add(i); + } //遍历每一列 List list = cm.getSheetMapping(upload_excel_filename_finish, i); for (Record record : list) {//列 @@ -595,6 +599,23 @@ public class CollectController extends Controller { FileOutputStream fileOut = new FileOutputStream(f2); wb.write(fileOut); + if (blankSheet.size() > 0) { + String t = ""; + for (Integer i : blankSheet) { + t += i + ","; + } + t = t.substring(0, t.length() - 1); + Kv kv = Kv.create(); + kv.set("success", false); + kv.set("message", "检查到输入的文件中存在空的Sheet表,序号为" + t + ",请下载文件后查看处理后,重新上传!"); + kv.set("upload_excel_filename_user", upload_excel_filename_user); + renderJson(kv); + //关闭Excel + wb.close(); + return; + } + + if (!flag) { Kv kv = Kv.create(); kv.set("success", false);