From c98be9ce1a1012bab73bcb9c1e475a30d003106a Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 16 Oct 2024 17:09:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20es=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/charts/impl/table/TableInfoHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java index 63805ef11e..275871c74a 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java @@ -89,7 +89,7 @@ public class TableInfoHandler extends DefaultChartHandler { pageInfo.setPageSize(chartExtRequest.getPageSize()); } Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage); - if(view.getIsExcelExport()){ + if (view.getIsExcelExport()) { for (int i = 0; i < xAxis.size(); i++) { ChartViewFieldDTO fieldDTO = null; for (ChartViewFieldDTO allField : allFields) { @@ -104,7 +104,7 @@ public class TableInfoHandler extends DefaultChartHandler { } } - String originSql = SQLProvider.createQuerySQL(sqlMeta, false, true, view);// 明细表强制加排序 + String originSql = SQLProvider.createQuerySQL(sqlMeta, false, !StringUtils.equalsIgnoreCase(dsMap.get(0).getType(), "es"), view);// 明细表强制加排序 String limit = ((pageInfo.getGoPage() != null && pageInfo.getPageSize() != null) ? " LIMIT " + pageInfo.getPageSize() + " OFFSET " + (pageInfo.getGoPage() - 1) * chartExtRequest.getPageSize() : ""); var querySql = originSql + limit;