From f2c0cbc48c52cc1c41c46c3fc7eb03ea44360ed9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 3 Jan 2023 16:48:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2Excel=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index d2cd3b99c5..e539ae10c8 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -208,7 +208,7 @@ public class ExtractDataService { for (DatasetTableField oldField : oldFields) { boolean delete = true; for (DatasetTableField datasetTableField : datasetTableFields) { - if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getDeExtractType().equals(datasetTableField.getDeExtractType())) { + if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { delete = false; } } @@ -220,7 +220,7 @@ public class ExtractDataService { for (DatasetTableField datasetTableField : datasetTableFields) { boolean add = true; for (DatasetTableField oldField : oldFields) { - if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getDeExtractType().equals(datasetTableField.getDeExtractType())) { + if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { add = false; } } From 653cdacd7941fa0ce18d3dd9e1f19ae046cf0b2c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 3 Jan 2023 17:16:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=A2=9E=E9=87=8Fsql=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/UpdateInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index f728a0bf28..6cd42c83ed 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -940,7 +940,7 @@ export default { this.sql = '' return } - if (this.incrementalConfig.incrementalAdd.length > 0) { + if (this.incrementalConfig?.incrementalAdd?.length > 0) { this.incrementalUpdateType = 'incrementalAdd' this.sql = this.incrementalConfig.incrementalAdd } else { From 588603ba5ff7a83f4518d731705654ed62f992a4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 4 Jan 2023 15:18:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20PG=E5=90=8C=E6=AD=A5=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/query/pg/PgQueryProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index 543a375faa..a3d9e9fe43 100644 --- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -803,8 +803,8 @@ public class PgQueryProvider extends QueryProvider { public String getTotalCount(boolean isTable, String sql, Datasource ds) { if(isTable){ String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); - String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, sql); - return "SELECT COUNT(*) from " + String.format(PgConstants.KEYWORD_TABLE, tableWithSchema); + String tableWithSchema = String.format(PgConstants.KEYWORD_TABLE, schema) + "." + String.format(PgConstants.KEYWORD_TABLE, sql); + return "SELECT COUNT(*) from " + tableWithSchema; }else { return "SELECT COUNT(*) from ( " + sql + " ) DE_COUNT_TEMP"; }