提交 9bc0ec95 authored 作者: junjie's avatar junjie

feat(feat):数据集,视图分组树优化,去除场景

上级 cdaba0eb
...@@ -86,6 +86,7 @@ public class ChartViewService { ...@@ -86,6 +86,7 @@ public class ChartViewService {
chartGroupRequest.setType("group"); chartGroupRequest.setType("group");
chartGroupRequest.setPid(chartViewRequest.getSceneId()); chartGroupRequest.setPid(chartViewRequest.getSceneId());
chartGroupRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); chartGroupRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
chartGroupRequest.setSort("name asc,create_time desc");
List<ChartGroupDTO> groups = extChartGroupMapper.search(chartGroupRequest); List<ChartGroupDTO> groups = extChartGroupMapper.search(chartGroupRequest);
List<ChartViewDTO> group = groups.stream().map(ele -> { List<ChartViewDTO> group = groups.stream().map(ele -> {
ChartViewDTO dto = new ChartViewDTO(); ChartViewDTO dto = new ChartViewDTO();
......
...@@ -197,6 +197,7 @@ public class DataSetTableService { ...@@ -197,6 +197,7 @@ public class DataSetTableService {
datasetGroup.setType("group"); datasetGroup.setType("group");
datasetGroup.setPid(dataSetTableRequest.getSceneId()); datasetGroup.setPid(dataSetTableRequest.getSceneId());
datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
datasetGroup.setSort("name asc,create_time desc");
List<DataSetGroupDTO> groups = extDataSetGroupMapper.search(datasetGroup); List<DataSetGroupDTO> groups = extDataSetGroupMapper.search(datasetGroup);
List<DataSetTableDTO> group = groups.stream().map(ele -> { List<DataSetTableDTO> group = groups.stream().map(ele -> {
DataSetTableDTO dto = new DataSetTableDTO(); DataSetTableDTO dto = new DataSetTableDTO();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论