From c2cb12c73b33bb35d09d8239dfb14c434a5565a9 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 2 Jun 2021 11:59:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=E6=B7=BB=E5=8A=A0db=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/dataset/DataSetTableService.java |  4 ----
 frontend/src/views/dataset/add/AddDB.vue              | 11 +++++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

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 36b1e343f2..71fd2a9f7b 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -102,10 +102,6 @@ public class DataSetTableService {
             datasetTable.setCreateBy(AuthUtils.getUser().getUsername());
             datasetTable.setCreateTime(System.currentTimeMillis());
             DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO();
-            if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) {
-                dataTableInfoDTO.setTable(datasetTable.getName());
-                datasetTable.setInfo(new Gson().toJson(dataTableInfoDTO));
-            }
             int insert = datasetTableMapper.insert(datasetTable);
             // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库
             if (insert == 1) {
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index be014f8dcf..44bf4daa1c 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -120,17 +120,24 @@ export default {
     save() {
       // console.log(this.checkTableList);
       // console.log(this.scene);
+      let ds = {}
+      this.options.forEach(ele => {
+        if (ele.id === this.dataSource) {
+          ds = ele
+        }
+      })
       const sceneId = this.param.id
       const dataSourceId = this.dataSource
       const tables = []
       const mode = this.mode
       this.checkTableList.forEach(function(name) {
         tables.push({
-          name: name,
+          name: ds.name + '_' + name,
           sceneId: sceneId,
           dataSourceId: dataSourceId,
           type: 'db',
-          mode: parseInt(mode)
+          mode: parseInt(mode),
+          info: JSON.stringify({ table: name })
         })
       })
       post('/dataset/table/batchAdd', tables).then(response => {