From 86446b4bf49ebd95bfa4cc0f94e2c875538d1103 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 01:21:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:()=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B0=83=E5=8A=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataRunNameServiceImpl.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 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 c7df7ee..5f658c5 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> set1 = new HashSet<>();
+        HashSet<DataName> set1 = new HashSet<>();
         //遍历获取数据数据库名称对象
         dataNameList.forEach(dataName -> {
 
@@ -142,24 +142,24 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 //在取数据数据遍历里获取表名称查询方法
                 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
 
-                    List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
-                    System.out.println(tableNames);
-                    set1.addAll(tableNames);
+                    DataName dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
+                    System.out.println(dataName1);
+                    set1.add(dataName1);
 
                 });
                 idByDeptId.forEach(tableIdAndBasicId -> {
-                    List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
-                    System.out.println(tableNames);
-                    set1.addAll(tableNames);
+                    DataName dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
+                    System.out.println(dataName1);
+                    set1.add(dataName1);
                 });
-            List<TableNames> set2 = new ArrayList<>(set1);
-            dataName.setTableNames(set2);
+//            dataName.setTableNames(set2);
         });
+        List<DataName> list = new ArrayList<>(set1);
         //返回所有数据
-        return dataNameList;
+        return list;
     }
 
-    private  List<TableNames> dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) {
+    private  DataName dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) {
         List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
                         .eq(TableNames::getDataId, dataName.getId())
                         .eq(TableNames::getId, tableIdAndBasicId.getTableId()))
@@ -185,7 +185,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
             List<TableFie> tableFies = this.tableStructureShow(tableName1);
             tableName1.setTableFie(tableFies);
         });
-        return tableNamesList;
+        return dataName;
     }
 
     /**