From 1afd3d48cd9e006187f9ee28345f6d5232f41a7f Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Thu, 11 Jan 2024 14:41:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-113059=20=E7=BC=96=E8=BE=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E5=8D=A1=E9=A1=BF=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8D=E6=98=8E=E6=98=BE=20=E4=BF=AE=E5=A4=8DdsName=E4=B8=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/worker/data/TableDataResult.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/worker/data/TableDataResult.java b/designer-base/src/main/java/com/fr/design/worker/data/TableDataResult.java
index b8261bea23..753259dbe5 100644
--- a/designer-base/src/main/java/com/fr/design/worker/data/TableDataResult.java
+++ b/designer-base/src/main/java/com/fr/design/worker/data/TableDataResult.java
@@ -1,6 +1,8 @@
 package com.fr.design.worker.data;
 
+import com.fr.base.AbstractTableData;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
+import com.fr.stable.StringUtils;
 
 /**
  * 数据集的worker结果
@@ -17,7 +19,10 @@ public class TableDataResult {
 
     public TableDataResult(TemplateTableDataWrapper wrapper) {
         this.wrapper = wrapper;
-        this.name = wrapper.getTableDataName();
+        // getTableDataInstance中就已经初始化了名字，但是没直接连到wrapper上来，如果直接wrapper.getTableDataName()获取不到
+        // 跟rinoux确认了一下【没直接连到wrapper上来】可能是存在额外考虑
+        // 因此在这里通过额外判断来复用，如果不符合预期就重新再拿一次name吧
+        this.name = wrapper.getTableData() instanceof AbstractTableData ? ((AbstractTableData) wrapper.getTableData()).getDsName() : StringUtils.EMPTY;
     }