From 219af08ee32f41bad06d63a2fda5525a2456522b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Jan 2023 11:49:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8):=20=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=BA=90=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=E5=9C=A8=E5=BA=94=E7=94=A8=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E4=B9=9F=E8=BF=9B=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/panel/PanelGroupService.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 61a92a9220..ae3ce9e76a 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -138,6 +138,9 @@ public class PanelGroupService {
     @Resource
     private PanelWatermarkMapper panelWatermarkMapper;
 
+    @Resource
+    private DatasourceMapper datasourceMapper;
+
     public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
         String userId = String.valueOf(AuthUtils.getUser().getUserId());
         panelGroupRequest.setUserId(userId);
@@ -1019,6 +1022,9 @@ public class PanelGroupService {
         templateLog.setDatasourceId(newDatasourceId);
         if (PanelConstants.APP_DATASOURCE_FROM.NEW.equals(request.getDatasourceFrom())) {
             templateLog.setSourceDatasourceName(request.getDatasourceList().get(0).getName());
+        } else {
+            Datasource applyDatasourceInfo = datasourceMapper.selectByPrimaryKey(newDatasourceId);
+            templateLog.setSourceDatasourceName(applyDatasourceInfo.getName());
         }
         templateLog.setDatasetGroupId(asideDatasetGroupId);
         templateLog.setSourceDatasetGroupName(request.getDatasetGroupName());