From 535d6f8770628f1b5184ff8a6b631be33b839a47 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Sat, 18 May 2024 17:35:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=9B=86=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/dataset/manage/DatasetDataManage.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index c1fb11d441..98e2410322 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -231,20 +231,21 @@ public class DatasetDataManage { map.put("allFields", fieldList); } map.put("sql", Base64.getEncoder().encodeToString(querySQL.getBytes())); - map.put("total", getDatasetTotal(datasetGroupInfoDTO, SqlUtils.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder), sqlMeta, crossDs, dsMap))); + String replaceSql = SqlUtils.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder), sqlMeta, crossDs, dsMap); + map.put("total", getDatasetTotal(datasetGroupInfoDTO, replaceSql, null)); return map; } public Long getDatasetTotal(Long datasetGroupId) throws Exception { DatasetGroupInfoDTO dto = datasetGroupManage.getForCount(datasetGroupId); if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) { - return getDatasetTotal(dto, null); + return getDatasetTotal(dto, null, new ChartExtRequest()); } return 0L; } - public Long getDatasetTotal(DatasetGroupInfoDTO datasetGroupInfoDTO, String s) throws Exception { - Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null); + public Long getDatasetTotal(DatasetGroupInfoDTO datasetGroupInfoDTO, String s, ChartExtRequest request) throws Exception { + Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, request); Map dsMap = (Map) sqlMap.get("dsMap"); String sql; From aba8ec5aaaeb7b8eff2e929305549d2387fa81af Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Sat, 18 May 2024 17:54:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf(X-Pack):=20=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../java/io/dataease/api/permissions/user/vo/UserGridVO.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index b550857633..84ddcd508b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit b550857633fc2ce85f895a2953661fe3954ecf06 +Subproject commit 84ddcd508b614bab67e08ca7bdc5e7a37573f59c diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java index 26394a4a52..cac1972d99 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java @@ -28,4 +28,6 @@ public class UserGridVO { private Long createTime; @Schema(description = "系统变量") private String sysVariable; + @Schema(description = "用户来源") + private Integer origin; }