diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java index 87f4f1eb..2d8b886b 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java @@ -18,7 +18,7 @@ public interface GenTableColumnMapper extends BaseMapperPlus selectDbTableListByNames(String[] tableNames, String dataName); @@ -67,7 +67,6 @@ public interface IGenTableService { * 修改业务 * * @param genTable 业务信息 - * @return 结果 */ void updateGenTable(GenTable genTable); @@ -75,7 +74,6 @@ public interface IGenTableService { * 删除业务信息 * * @param tableIds 需要删除的表数据ID - * @return 结果 */ void deleteGenTableByIds(Long[] tableIds); @@ -83,7 +81,7 @@ public interface IGenTableService { * 导入表结构 * * @param tableList 导入表列表 - * @param dataName + * @param dataName 数据源名称 */ void importGenTable(List tableList, String dataName); @@ -107,7 +105,6 @@ public interface IGenTableService { * 生成代码(自定义路径) * * @param tableId 表名称 - * @return 数据 */ void generatorCode(Long tableId); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 5641f853..f4f86e6b 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -125,7 +125,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dt.table_name = uo.object_name and uo.object_type = 'TABLE' AND dt.table_name NOT LIKE 'XXL_JOB_%' AND dt.table_name NOT LIKE 'GEN_%' - AND dt.table_name NOT IN (select table_name from gen_table) and lower(dt.table_name) in #{name} @@ -161,9 +160,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES' AND D.NAME NOT LIKE 'xxl_job_%' AND D.NAME NOT LIKE 'gen_%' AND D.NAME in - - #{name} - + + #{name} +