From 17bf0c06236c2956ad9b6fe2b89524de7a0c608c 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: Sat, 27 Apr 2024 16:15:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E8=A1=A8=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/generator/GenTableMapper.xml       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

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 b1745891d..bd2c9e84b 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
@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             from information_schema.tables
             where table_schema = (select database())
             AND table_name NOT LIKE 'pj_%' AND table_name NOT LIKE 'gen_%'
+            AND table_name NOT LIKE 'act_%' AND table_name NOT LIKE 'flw_%'
             <if test="genTable.params.genTableNames != null and genTable.params.genTableNames.size > 0">
                 AND table_name NOT IN
                 <foreach collection="genTable.params.genTableNames" open="(" close=")" separator="," item="item">
@@ -41,6 +42,7 @@ 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 'pj_%' AND dt.table_name NOT LIKE 'GEN_%'
+            AND dt.table_name NOT LIKE 'act_%' AND dt.table_name NOT LIKE 'flw_%'
             <if test="genTable.params.genTableNames != null and genTable.params.genTableNames.size > 0">
                 AND lower(dt.table_name) NOT IN
                 <foreach collection="genTable.params.genTableNames" open="(" close=")" separator="," item="item">
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     AND n.nspname <![CDATA[ <> ]]> ''::name
             ) list_table
             where table_name NOT LIKE 'pj_%' AND table_name NOT LIKE 'gen_%'
+            AND table_name NOT LIKE 'act_%' AND table_name NOT LIKE 'flw_%'
             <if test="genTable.params.genTableNames != null and genTable.params.genTableNames.size > 0">
                 AND table_name NOT IN
                 <foreach collection="genTable.params.genTableNames" open="(" close=")" separator="," item="item">
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 INNER JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID
                     AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
                     AND D.NAME NOT LIKE 'pj_%' AND D.NAME NOT LIKE 'gen_%'
+                    AND D.NAME NOT LIKE 'act_%' AND D.NAME NOT LIKE 'flw_%'
             <if test="genTable.params.genTableNames != null and genTable.params.genTableNames.size > 0">
                 AND D.NAME NOT IN
                 <foreach collection="genTable.params.genTableNames" open="(" close=")" separator="," item="item">
@@ -112,7 +116,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDbTableListByNames" resultMap="GenTableResult">
         <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isMySql()">
             select table_name, table_comment, create_time, update_time from information_schema.tables
-            where table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+            where table_schema = (select database())
+            and table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%'
+            and table_name NOT LIKE 'act_%' AND table_name NOT LIKE 'flw_%'
             and table_name in
             <foreach collection="array" item="name" open="(" separator="," close=")">
                  #{name}
@@ -124,7 +130,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where dt.table_name = dtc.table_name
             and dt.table_name = uo.object_name
             and uo.object_type = 'TABLE'
-            AND dt.table_name NOT LIKE 'pj_%' AND dt.table_name NOT LIKE 'GEN_%'
+            and dt.table_name NOT LIKE 'pj_%' AND dt.table_name NOT LIKE 'GEN_%'
+            and dt.table_name NOT LIKE 'act_%' AND dt.table_name NOT LIKE 'flw_%'
             and lower(dt.table_name) in
             <foreach collection="array" item="name" open="(" separator="," close=")">
                 #{name}
@@ -145,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     AND n.nspname <![CDATA[ <> ]]> ''::name
             ) list_table
             where table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%'
+            and table_name NOT LIKE 'act_%' and table_name NOT LIKE 'flw_%'
             and table_name in
             <foreach collection="array" item="name" open="(" separator="," close=")">
                 #{name}
@@ -159,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 INNER JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID
                     AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
                     AND D.NAME NOT LIKE 'pj_%' AND D.NAME NOT LIKE 'gen_%'
+                    AND D.NAME NOT LIKE 'act_%' AND D.NAME NOT LIKE 'flw_%'
                     AND D.NAME in
                     <foreach collection="array" item="name" open="(" separator="," close=")">
                         #{name}
@@ -169,7 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
         <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isMySql()">
             select table_name, table_comment, create_time, update_time from information_schema.tables
-            where table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+            where table_schema = (select database())
+            and table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%'
+            and table_name NOT LIKE 'act_%' AND table_name NOT LIKE 'flw_%'
             and table_name = #{tableName}
         </if>
         <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isOracle()">
@@ -179,6 +190,7 @@ 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 'pj_%' AND dt.table_name NOT LIKE 'GEN_%'
+            AND dt.table_name NOT LIKE 'act_%' AND dt.table_name NOT LIKE 'flw_%'
             AND dt.table_name NOT IN (select table_name from gen_table)
             and lower(dt.table_name) = #{tableName}
         </if>
@@ -197,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     AND n.nspname <![CDATA[ <> ]]> ''::name
             ) list_table
             where table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%'
+            and table_name NOT LIKE 'act_%' and table_name NOT LIKE 'flw_%'
             and table_name = #{tableName}
         </if>
         <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isSqlServer()">
@@ -208,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 INNER JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID
                     AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
                     AND D.NAME NOT LIKE 'pj_%' AND D.NAME NOT LIKE 'gen_%'
+                    AND D.NAME NOT LIKE 'act_%' AND D.NAME NOT LIKE 'flw_%'
                     AND D.NAME = #{tableName}
         </if>
     </select>