From 788331ee6063c075a3005a59d84f213463e58bb0 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 3 Nov 2021 11:57:26 +0800 Subject: [PATCH 1/2] fix: redshift sql --- .../dataease/provider/query/redshift/RedshiftQueryProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index 8b6adc8ec7..71e6cd0796 100644 --- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -183,7 +183,7 @@ public class RedshiftQueryProvider extends QueryProvider { @Override public String createQuerySQLWithPage(String sql, List fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) { - return createQuerySQL(sql, fields, isGroup, null) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize; + return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize; } @Override From 21a8dce89ab5796fc6d1908b8bb7d3f660b0c30b Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 3 Nov 2021 14:08:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20cron=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/cron/cron.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/cron/cron.vue b/frontend/src/components/cron/cron.vue index d694fc9715..56e9df57cc 100644 --- a/frontend/src/components/cron/cron.vue +++ b/frontend/src/components/cron/cron.vue @@ -126,9 +126,9 @@ export default { }) } const v = `${this.sVal} ${this.mVal} ${this.hVal} ${this.dVal} ${this.monthVal} ${this.weekVal} ${this.yearVal}` - if (v !== this.value) { - this.$emit('input', v) - } + // if (v !== this.value) { + this.$emit('input', v) + // } return v } },