From 6426f866957243498e99133ae2bcce1b2ba69533 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 24 Nov 2023 11:56:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=AD=97=E6=AE=B5=E5=AF=BC=E5=85=A5=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 9 +++++---- .../io/dataease/service/dataset/ExtractDataService.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 7e52ef1a6d..73efecfc45 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2436,10 +2436,11 @@ public class DataSetTableService { }); data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data); if (isPreview) { - for (List datum : data) { - for (int i = 0; i < datum.size(); i++) { - if (i < fields.size()) { - cellType(datum.get(i), i, fields.get(i)); + for (int i = 0; i < data.size(); i++) { + List datum = data.get(i); + for (int j = 0; j < datum.size(); j++) { + if (j < fields.size()) { + cellType(datum.get(j), i, fields.get(j)); } } } diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index ea634adeb7..d8a0f693b1 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -223,7 +223,7 @@ public class ExtractDataService { for (DatasetTableField datasetTableField : datasetTableFields) { boolean add = true; for (DatasetTableField oldField : oldFields) { - if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { + if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) { add = false; } }