From 797e94d72b00a010768a44f8f6336f6f4321de46 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 21 Dec 2023 16:28:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E3=80=91-=E6=9C=AC=E5=9C=B0Excel=E6=96=87=E4=BB=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/ExcelUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java index e3ad66c17b..7f19164eb6 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java @@ -416,9 +416,6 @@ public class ExcelUtils { } List data = new ArrayList<>(noModelDataListener.getData()); if (isPreview) { - if (data.size() > 100) { - data = data.subList(0, 100); - } for (int i = 0; i < data.size(); i++) { for (int j = 0; j < data.get(i).length; j++) { if (j < fields.size()) { @@ -426,6 +423,9 @@ public class ExcelUtils { } } } + if (data.size() > 100) { + data = data.subList(0, 100); + } } for (int i = 0; i < fields.size(); i++) { @@ -472,6 +472,9 @@ public class ExcelUtils { } } } + if (data.size() > 100) { + data = data.subList(0, 100); + } } for (int i = 0; i < fields.size(); i++) { if (StringUtils.isEmpty(fields.get(i).getFieldType())) {