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:
疯狂的狮子Li 2024-07-23 11:44:39 +08:00
parent 0c4e9dc813
commit 0b78f9361d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,9 +131,22 @@ public class GenTableServiceImpl implements IGenTableService {
if (CollUtil.isEmpty(tablesMap)) { if (CollUtil.isEmpty(tablesMap)) {
return TableDataInfo.build(); return TableDataInfo.build();
} }
List<String> tableNames = baseMapper.selectTableNameList(genTable.getDataName());
String[] tableArrays;
if (CollUtil.isNotEmpty(tableNames)) {
tableArrays = tableNames.toArray(new String[0]);
} else {
tableArrays = new String[0];
}
// 过滤并转换表格数据 // 过滤并转换表格数据
List<GenTable> tables = tablesMap.values().stream() List<GenTable> tables = tablesMap.values().stream()
.filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE)) .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> {
if (CollUtil.isEmpty(tableNames)) {
return true;
}
return !StringUtils.containsAnyIgnoreCase(x.getName(), tableArrays);
})
.filter(x -> { .filter(x -> {
boolean nameMatches = true; boolean nameMatches = true;
boolean commentMatches = true; boolean commentMatches = true;