From e127f8824f17d688fa3189f88e7f9eedef48376c Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Sat, 7 Sep 2024 09:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC3.0=E8=B1=AA=E5=8D=8E=E7=89=88=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataRunNameServiceImpl.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
index c24020c..377dea3 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
@@ -116,7 +116,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
         //数据库名称查询
         List<DataName> dataNameList = dataNameService.list().stream()
                 .map(DataName::dataNameBuild).toList();
-
+        HashSet<TableNames> set = new HashSet<>();
         //遍历获取数据数据库名称对象
         dataNameList.forEach(dataName -> {
 
@@ -143,13 +143,13 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
 
 
-                        this.dataDeptShow(tableIdAndBasicId,dataName);
-
+                    List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
 
+                    set.addAll(tableNames);
                 });
                 idByDeptId.forEach(tableIdAndBasicId -> {
-                    this.dataDeptShow(tableIdAndBasicId,dataName);
-
+                    List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
+                    set.addAll(tableNames);
                 });
 
             }
@@ -158,7 +158,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
         return dataNameList;
     }
 
-    private void dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) {
+    private  List<TableNames> dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) {
         List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
                         .eq(TableNames::getDataId, dataName.getId())
                         .eq(TableNames::getId, tableIdAndBasicId.getTableId()))
@@ -169,7 +169,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
 
         //判断tableNamesList查询数据为空直接返回
         if (CollectionUtils.isEmpty(tableNamesList)) {
-            return;
+            return null;
         }
 
         //在每一次循环中创建一个新的集合
@@ -178,11 +178,12 @@ public class DataRunNameServiceImpl implements DataRunNameService {
         dataName.setTableNames(namesArrayList);
         //将添加好的实体类集合进行遍历操作
         log.info("数据库表名称:{}",dataName.getTableNames());
-        if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
+        if (CollectionUtils.isEmpty(dataName.getTableNames())) {return null;}
         //在内部封装方法
         dataName.getTableNames().forEach(tableName1 -> {
             this.tableStructureShow(tableName1);
         });
+        return tableNamesList;
     }
 
     /**