admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复判断表名为空错误

Browse Source
This commit is contained in:
AprilWind 2024-07-19 16:50:40 +08:00
parent 49c18dab63
commit 82fdb37c6b
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
View File

@ -3,6 +3,7 @@ package org.dromara.generator.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@ -124,8 +125,12 @@ public class GenTableServiceImpl implements IGenTableService {
Integer pageNum = pageQuery.getPageNum(); Integer pageNum = pageQuery.getPageNum();
Integer pageSize = pageQuery.getPageSize(); 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 -> { .filter(x -> {
boolean nameMatches = true; boolean nameMatches = true;
boolean commentMatches = true; boolean commentMatches = true;
@ -167,9 +172,18 @@ public class GenTableServiceImpl implements IGenTableService {
@Override @Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) { public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
Set<String> tableNameSet = new HashSet<>(List.of(tableNames)); 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(); .filter(x -> tableNameSet.contains(x.getName())).toList();
if (ArrayUtil.isEmpty(tableList)) {
return new ArrayList<>();
}
return tableList.stream().map(x -> { return tableList.stream().map(x -> {
GenTable gen = new GenTable(); GenTable gen = new GenTable();
gen.setDataName(dataName); gen.setDataName(dataName);