From 93d380673ebe3992d5178bcbb9d9f9592e308a72 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 16 Jun 2021 10:38:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(fix):=E6=95=B0=E6=8D=AE=E9=9B=86=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/DataSetTableService.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index c0355a9e63..4014d37c96 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -274,9 +274,8 @@ public class DataSetTableService { e.printStackTrace(); } try { -// datasourceRequest.setQuery(qp.createQueryCountSQL(table)); -// dataSetPreviewPage.setTotal(Integer.valueOf(datasourceProvider.getData(datasourceRequest).get(0)[0])); - dataSetPreviewPage.setTotal(Integer.parseInt(dataSetTableRequest.getRow())); + datasourceRequest.setQuery(qp.createQuerySQL(table, fields) + " LIMIT 0," + dataSetTableRequest.getRow()); + dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); } @@ -298,9 +297,8 @@ public class DataSetTableService { e.printStackTrace(); } try { -// datasourceRequest.setQuery(qp.createQueryCountSQLAsTmp(sql)); -// dataSetPreviewPage.setTotal(Integer.valueOf(datasourceProvider.getData(datasourceRequest).get(0)[0])); - dataSetPreviewPage.setTotal(Integer.parseInt(dataSetTableRequest.getRow())); + datasourceRequest.setQuery(qp.createQuerySQLAsTmp(sql, fields) + " LIMIT 0," + dataSetTableRequest.getRow()); + dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); }