From 9d7cea8f8e32ce0d813b49b9faafd7d94d3a5186 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 16:48:31 +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  | 64 ++++++++++++++-----
 1 file changed, 48 insertions(+), 16 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 83e22e2..79c63ed 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
@@ -142,27 +142,59 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 //在取数据数据遍历里获取表名称查询方法
                 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
 
-                    List<TableNames> dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
-                    if (CollectionUtils.isEmpty(dataName1)){
-                        return;
+                    //判断getId不为空
+                    if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
+
+                        //在取数据数据遍历里获取表名称查询方法
+                        List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
+                                        .eq(TableNames::getDataId, dataName.getId())
+                                        .eq(TableNames::getId, tableIdAndBasicId.getTableId()))
+
+                                .stream()
+                                .map(TableNames::tableNamesBuild)
+                                .toList();
+
+                        //判断tableNamesList查询数据为空直接返回
+                        if (CollectionUtils.isEmpty(tableNamesList)) {
+                            return;
+                        }
+
+                        //在每一次循环中创建一个新的集合
+                        ArrayList<TableNames> namesArrayList = new ArrayList<>(tableNamesList);
+                        //添加到数据库实体类集合字段上
+                        dataName.setTableNames(namesArrayList);
+                        //将添加好的实体类集合进行遍历操作
+                        log.info("数据库表名称:{}",dataName.getTableNames());
+                        if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
                     }
-                    dataName1.forEach(tableNames -> {
-                        set1.add(tableNames);
-                    });
-
-
                 });
                 idByDeptId.forEach(tableIdAndBasicId -> {
-                    List<TableNames> dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
-                    if (CollectionUtils.isEmpty(dataName1)){
-                        return;
+                    //判断getId不为空
+                    if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
+
+                        //在取数据数据遍历里获取表名称查询方法
+                        List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
+                                        .eq(TableNames::getDataId, dataName.getId())
+                                        .eq(TableNames::getId, tableIdAndBasicId.getTableId()))
+
+                                .stream()
+                                .map(TableNames::tableNamesBuild)
+                                .toList();
+
+                        //判断tableNamesList查询数据为空直接返回
+                        if (CollectionUtils.isEmpty(tableNamesList)) {
+                            return;
+                        }
+
+                        //在每一次循环中创建一个新的集合
+                        ArrayList<TableNames> namesArrayList = new ArrayList<>(tableNamesList);
+                        //添加到数据库实体类集合字段上
+                        dataName.setTableNames(namesArrayList);
+                        //将添加好的实体类集合进行遍历操作
+                        log.info("数据库表名称:{}",dataName.getTableNames());
+                        if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
                     }
-                    dataName1.forEach(tableNames -> {
-                        set1.add(tableNames);
-                    });
                 });
-            ArrayList<TableNames> namesArrayList = new ArrayList<>(set1);
-            dataName.setTableNames(namesArrayList);
         });
         //返回所有数据
         return dataNameList;