From 0bb55b3a453351905ea20f87ef1e83ecfd12ab49 Mon Sep 17 00:00:00 2001
From: xiaohuang <1559741705@qq.com>
Date: Wed, 24 Apr 2024 19:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B5=84=E4=BA=A7=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=AE=9E=E7=8E=B0=20=E8=AF=95=E9=AA=8C6=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/etl/domain/TableInfo.java          | 4 ++++
 .../java/com/muyu/etl/domain/resp/TableInfoStructureResp.java | 1 +
 .../com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java
index e92602a..4f03f23 100644
--- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java
+++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java
@@ -48,4 +48,8 @@ public class TableInfo extends TreeEntity {
     @Excel(name = "是否核心 'Y'是 'N'不是")
     private String center;
 
+
+    private Long parentId;
+
+
 }
diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java
index 7dbb3f8..5400311 100644
--- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java
+++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java
@@ -46,6 +46,7 @@ public class TableInfoStructureResp {
      */
     @Excel(name = "表备注")
     private String tableRemark;
+    private Long parentId;
 
 
     /**
diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
index 469a161..c83bc1c 100644
--- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
+++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
@@ -129,7 +129,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl<BasicConfigInfoMappe
                 TableInfo build = TableInfo.builder()
                         .basicId(basicConfigInfo.getId())
                         .tableName(tableName1)
-                        .tableRemark(tableRemark.isEmpty() ? "" : tableRemark)
+                        .tableRemark(tableRemark.isEmpty() ? "null" : tableRemark)
                         .parentId(tableInfo.getId())
                         .center("Y")
                         .updateBy(SecurityUtils.getUsername())
@@ -318,6 +318,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl<BasicConfigInfoMappe
                         .center(info.getCenter())
                         .tableRemark(info.getTableRemark())
                         .dataNum(info.getDataNum())
+                        .parentId(info.getParentId())
                         .databaseType(basicConfigInfo.getDatabaseType())
                         .structureList(structureList)
                         .basicId(info.getBasicId())