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 dataNameList = dataNameService.list().stream() .map(DataName::dataNameBuild).toList(); - + HashSet set = new HashSet<>(); //遍历获取数据数据库名称对象 dataNameList.forEach(dataName -> { @@ -143,13 +143,13 @@ public class DataRunNameServiceImpl implements DataRunNameService { tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> { - this.dataDeptShow(tableIdAndBasicId,dataName); - + List tableNames = this.dataDeptShow(tableIdAndBasicId, dataName); + set.addAll(tableNames); }); idByDeptId.forEach(tableIdAndBasicId -> { - this.dataDeptShow(tableIdAndBasicId,dataName); - + List 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 dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) { List tableNamesList = tableRunNameService.list(new LambdaQueryWrapper() .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; } /**