From 017dcffe6716bdecc1c2067f46fab01c5477f860 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 27 Dec 2023 18:05:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8=E9=80=89=E9=A1=B9=E5=85=88=E6=8E=92=E5=BA=8F=E5=8E=BB?= =?UTF-8?q?=E9=87=8D=E5=86=8D=E5=8F=961000=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/impl/direct/DirectFieldService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java b/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java index 2358fda047..a42b0058cd 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java @@ -153,7 +153,7 @@ public class DirectFieldService implements DataSetFieldService { DatasourceRequest datasourceRequest = new DatasourceRequest(); Provider datasourceProvider = null; String createSQL = null; - Long calcLimit = needMapping ? null : 1000L; + Long calcLimit = needMapping ? null : 100000L; if (datasetTable.getMode() == 0) {// 直连 if (StringUtils.isEmpty(datasetTable.getDataSourceId())) return null; Datasource ds = datasourceService.get(datasetTable.getDataSourceId()); @@ -185,7 +185,8 @@ public class DirectFieldService implements DataSetFieldService { String sql = (String) dataSetTableService.getUnionSQLDatasource(dt, ds).get("sql"); createSQL = qp.createQuerySQLAsTmp(sql, permissionFields, !needSort, customFilter, rowPermissionsTree, deSortFields, calcLimit, keyword); } - datasourceRequest.setQuery(needMapping ? createSQL : qp.createSQLPreview(createSQL, null)); + // datasourceRequest.setQuery(needMapping ? createSQL : qp.createSQLPreview(createSQL, null)); + datasourceRequest.setQuery(createSQL); } else if (datasetTable.getMode() == 1) {// 抽取 // 连接doris,构建doris数据源查询 @@ -220,7 +221,7 @@ public class DirectFieldService implements DataSetFieldService { assert datasourceProvider != null; List rows = datasourceProvider.getData(datasourceRequest); if (!needMapping) { - return rows.stream().map(row -> row[0]).distinct().collect(Collectors.toList()); + return rows.stream().map(row -> row[0]).distinct().limit(1000L).collect(Collectors.toList()); } Set pkSet = new HashSet<>(); if (CollectionUtils.isNotEmpty(rows) && existExtSortField && originSize > 0) {