From 82fdb37c6b54fe591b04fea23b46a997921015fc Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期五, 19 七月 2024 16:50:40 +0800
Subject: [PATCH] fix 修复判断表名为空错误
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index 3fcd33f..6ee23bd 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -124,8 +125,12 @@
Integer pageNum = pageQuery.getPageNum();
Integer pageSize = pageQuery.getPageSize();
+ LinkedHashMap<String, Table> tablesMap = ServiceProxy.metadata().tables();
+ if (CollUtil.isEmpty(tablesMap)) {
+ return TableDataInfo.build();
+ }
// 杩囨护骞惰浆鎹㈣〃鏍兼暟鎹�
- List<GenTable> tables = ServiceProxy.metadata().tables().values().stream()
+ List<GenTable> tables = tablesMap.values().stream()
.filter(x -> {
boolean nameMatches = true;
boolean commentMatches = true;
@@ -167,9 +172,18 @@
@Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
Set<String> tableNameSet = new HashSet<>(List.of(tableNames));
- List<Table> tableList = ServiceProxy.metadata().tables().values().stream()
+ LinkedHashMap<String, Table> tablesMap = ServiceProxy.metadata().tables();
+
+ if (CollUtil.isEmpty(tablesMap)) {
+ return new ArrayList<>();
+ }
+
+ List<Table> tableList = tablesMap.values().stream()
.filter(x -> tableNameSet.contains(x.getName())).toList();
+ if (ArrayUtil.isEmpty(tableList)) {
+ return new ArrayList<>();
+ }
return tableList.stream().map(x -> {
GenTable gen = new GenTable();
gen.setDataName(dataName);
--
Gitblit v1.9.3