From 14b456f32a87aa7f20642b11d5a71e9f7e418f47 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 29 Jul 2021 11:28:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=20excel=20=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C=E4=B8=8D=E8=83=BD=E6=9C=89=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/commons/utils/ExcelXlsxReader.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
index d9deffac6d..84ba92c6d8 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
@@ -250,13 +250,16 @@ public class ExcelXlsxReader extends DefaultHandler {
                 preRef = ref;
             }
             //补全单元格之间的空单元格
-            if (!ref.equals(preRef)) {
+            if (!"A".equals(preRef.substring(0, 1)) && curRow==1) {
+                throw new RuntimeException(Translator.get("i18n_excel_empty_column"));
+            }else if (!ref.equals(preRef)) {
                 int len = countNullCell(ref, preRef);
                 for (int i = 0; i < len; i++) {
                     cellList.add(curCol, "");
                     curCol++;
                 }
             }
+
             cellList.add(curCol, value);
             curCol++;
             //如果里面某个单元格含有值，则标识该行不为空行