From 9bc0ec95da398800ce94438210217ba5b235294c Mon Sep 17 00:00:00 2001 From: junjie Date: Sat, 19 Jun 2021 11:58:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(feat):=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=88=86=E7=BB=84=E6=A0=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 1 + .../java/io/dataease/service/dataset/DataSetTableService.java | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 817458703f..3b0d974b69 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -86,6 +86,7 @@ public class ChartViewService { chartGroupRequest.setType("group"); chartGroupRequest.setPid(chartViewRequest.getSceneId()); chartGroupRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); + chartGroupRequest.setSort("name asc,create_time desc"); List groups = extChartGroupMapper.search(chartGroupRequest); List group = groups.stream().map(ele -> { ChartViewDTO dto = new ChartViewDTO(); 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 55e2cb486b..42680da5d1 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -197,6 +197,7 @@ public class DataSetTableService { datasetGroup.setType("group"); datasetGroup.setPid(dataSetTableRequest.getSceneId()); datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); + datasetGroup.setSort("name asc,create_time desc"); List groups = extDataSetGroupMapper.search(datasetGroup); List group = groups.stream().map(ele -> { DataSetTableDTO dto = new DataSetTableDTO();