Merge pull request #9718 from dataease/pr@dev-v2@perf_user_origin

Pr@dev v2@perf user origin
dataease · May 18, 2024 · b31fcbb · b31fcbb
2 parents 426cacb + aba8ec5
commit b31fcbb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 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
@@ -231,20 +231,21 @@ public Map<String, Object> previewDataWithLimit(DatasetGroupInfoDTO datasetGroup
             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<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null);
+    public Long getDatasetTotal(DatasetGroupInfoDTO datasetGroupInfoDTO, String s, ChartExtRequest request) throws Exception {
+        Map<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, request);
         Map<Long, DatasourceSchemaDTO> dsMap = (Map<Long, DatasourceSchemaDTO>) sqlMap.get("dsMap");
 
         String sql;

diff --git a/de-xpack b/de-xpack
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
@@ -28,4 +28,6 @@ public class UserGridVO {
     private Long createTime;
     @Schema(description = "系统变量")
     private String sysVariable;
+    @Schema(description = "用户来源")
+    private Integer origin;
 }