فهرست منبع

fix 修复 已经导入的表 未过滤问题

疯狂的狮子Li 9 ماه پیش
والد
کامیت
0b78f9361d

+ 13 - 0
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java

@@ -131,9 +131,22 @@ public class GenTableServiceImpl implements IGenTableService {
         if (CollUtil.isEmpty(tablesMap)) {
             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()
             .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+            .filter(x -> {
+                if (CollUtil.isEmpty(tableNames)) {
+                    return true;
+                }
+                return !StringUtils.containsAnyIgnoreCase(x.getName(), tableArrays);
+            })
             .filter(x -> {
                 boolean nameMatches = true;
                 boolean commentMatches = true;