From 35a9a8f390ef213a6f0ef16fc2a2a7a3d688bb3f Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 22 Jun 2021 11:48:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=E6=95=B0=E6=8D=AE=E9=9B=86=E3=80=81?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=88=86=E7=BB=84=E6=9D=83=E9=99=90=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/chart/ChartViewService.java | 4 +---
 .../java/io/dataease/service/dataset/DataSetTableService.java | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

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 3b0d974b69..ad1f1a117e 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -90,11 +90,9 @@ public class ChartViewService {
         List<ChartGroupDTO> groups = extChartGroupMapper.search(chartGroupRequest);
         List<ChartViewDTO> group = groups.stream().map(ele -> {
             ChartViewDTO dto = new ChartViewDTO();
-            dto.setId(ele.getId());
-            dto.setName(ele.getName());
+            BeanUtils.copyBean(dto, ele);
             dto.setIsLeaf(false);
             dto.setType("group");
-            dto.setPid(ele.getPid());
             return dto;
         }).collect(Collectors.toList());
         group.addAll(charts);
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 42680da5d1..b0c1df05be 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -201,11 +201,9 @@ public class DataSetTableService {
         List<DataSetGroupDTO> groups = extDataSetGroupMapper.search(datasetGroup);
         List<DataSetTableDTO> group = groups.stream().map(ele -> {
             DataSetTableDTO dto = new DataSetTableDTO();
-            dto.setId(ele.getId());
-            dto.setName(ele.getName());
+            BeanUtils.copyBean(dto, ele);
             dto.setIsLeaf(false);
             dto.setType("group");
-            dto.setPid(ele.getPid());
             return dto;
         }).collect(Collectors.toList());
         group.addAll(ds);