dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 【数据集】替换数据集，有的字段导入失败

Browse Source
This commit is contained in:
taojinlong 2023-11-24 11:56:08 +08:00
parent 4175d58e8f
commit 6426f86695
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2436,10 +2436,11 @@ public class DataSetTableService {
}); });
data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data); data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data);
if (isPreview) { if (isPreview) {
for (List<String> datum : data) { for (int i = 0; i < data.size(); i++) {
for (int i = 0; i < datum.size(); i++) { List<String> datum = data.get(i);
if (i < fields.size()) { for (int j = 0; j < datum.size(); j++) {
cellType(datum.get(i), i, fields.get(i)); if (j < fields.size()) {
cellType(datum.get(j), i, fields.get(j));
} }
} }
} }

2
core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -223,7 +223,7 @@ public class ExtractDataService {
for (DatasetTableField datasetTableField : datasetTableFields) { for (DatasetTableField datasetTableField : datasetTableFields) {
boolean add = true; boolean add = true;
for (DatasetTableField oldField : oldFields) { for (DatasetTableField oldField : oldFields) {
if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) {
add = false; add = false;
} }
} }