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 5f658c5..19601ce 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<DataName> set1 = new HashSet<>();
+        HashSet<TableNames> set1 = new HashSet<>();
         //遍历获取数据数据库名称对象
         dataNameList.forEach(dataName -> {
 
@@ -142,24 +142,32 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 //在取数据数据遍历里获取表名称查询方法
                 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
 
-                    DataName dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
-                    System.out.println(dataName1);
-                    set1.add(dataName1);
+                    List<TableNames> dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
+                    if (CollectionUtils.isEmpty(dataName1)){
+                        return;
+                    }
+                    dataName1.forEach(tableNames -> {
+                        set1.add(tableNames);
+                    });
+
 
                 });
                 idByDeptId.forEach(tableIdAndBasicId -> {
-                    DataName dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
-                    System.out.println(dataName1);
-                    set1.add(dataName1);
+                    List<TableNames> dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
+                    if (CollectionUtils.isEmpty(dataName1)){
+                        return;
+                    }
+                    dataName1.forEach(tableNames -> {
+                        set1.add(tableNames);
+                    });
                 });
-//            dataName.setTableNames(set2);
+            dataName.setTableNames((List<TableNames>) set1);
         });
-        List<DataName> list = new ArrayList<>(set1);
         //返回所有数据
-        return list;
+        return dataNameList;
     }
 
-    private  DataName 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()))
@@ -173,19 +181,16 @@ public class DataRunNameServiceImpl implements DataRunNameService {
             return null;
         }
 
-        //在每一次循环中创建一个新的集合
-        ArrayList<TableNames> namesArrayList = new ArrayList<>(tableNamesList);
         //添加到数据库实体类集合字段上
-        dataName.setTableNames(namesArrayList);
         //将添加好的实体类集合进行遍历操作
         log.info("数据库表名称:{}",dataName.getTableNames());
         if (CollectionUtils.isEmpty(dataName.getTableNames())) {return null;}
         //在内部封装方法
-        dataName.getTableNames().forEach(tableName1 -> {
+        tableNamesList.forEach(tableName1 -> {
             List<TableFie> tableFies = this.tableStructureShow(tableName1);
             tableName1.setTableFie(tableFies);
         });
-        return dataName;
+        return tableNamesList;
     }
 
     /**