From ee7c5fbbd9fe0073713f5873c8bf7cc04c4d3677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Mon, 29 May 2023 11:32:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20!pr349=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=BB=9F=E4=B8=80=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/generator/mapper/GenTableColumnMapper.java | 2 +-
 .../org/dromara/generator/service/GenTableServiceImpl.java | 7 ++-----
 .../org/dromara/generator/service/IGenTableService.java    | 7 ++-----
 .../src/main/resources/mapper/generator/GenTableMapper.xml | 7 +++----
 4 files changed, 8 insertions(+), 15 deletions(-)

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<GenTableColumn, Gen
      * 根据表名称查询列信息
      *
      * @param tableName 表名称
-     * @param dataName
+     * @param dataName  数据源名称
      * @return 列信息
      */
     @DS("#dataName")
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 77ef3036..8d0e38f5 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
@@ -54,7 +54,6 @@ import java.util.zip.ZipOutputStream;
  *
  * @author Lion Li
  */
-// @DS("#header.datasource")
 @Slf4j
 @RequiredArgsConstructor
 @Service
@@ -120,7 +119,7 @@ public class GenTableServiceImpl implements IGenTableService {
      * 查询据库列表
      *
      * @param tableNames 表名称组
-     * @param dataName
+     * @param dataName   数据源名称
      * @return 数据库表集合
      */
     @DS("#dataName")
@@ -143,7 +142,6 @@ public class GenTableServiceImpl implements IGenTableService {
      * 修改业务
      *
      * @param genTable 业务信息
-     * @return 结果
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -162,7 +160,6 @@ public class GenTableServiceImpl implements IGenTableService {
      * 删除业务对象
      *
      * @param tableIds 需要删除的数据ID
-     * @return 结果
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -176,7 +173,7 @@ public class GenTableServiceImpl implements IGenTableService {
      * 导入表结构
      *
      * @param tableList 导入表列表
-     * @param dataName
+     * @param dataName  数据源名称
      */
     @DSTransactional
     @Override
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
index 51d3e230..2a2fb822 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
@@ -43,7 +43,7 @@ public interface IGenTableService {
      * 查询据库列表
      *
      * @param tableNames 表名称组
-     * @param dataName
+     * @param dataName   数据源名称
      * @return 数据库表集合
      */
     List<GenTable> 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<GenTable> 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
             <foreach collection="array" item="name" open="(" separator="," close=")">
                 #{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
-            <foreach collection="array" item="name" open="(" separator="," close=")">
-                #{name}
-            </foreach>
+                    <foreach collection="array" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
         </if>
     </select>