From ef2d1476f18163c36e56229e191f2067e3af170c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 11 Sep 2019 19:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E8=A1=A8?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/generator/util/GenUtils.java    | 20 ++++++++++++++++++-
 .../src/main/resources/generator.yml          |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 2fb67e79..24f3924d 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -164,7 +164,9 @@ public class GenUtils
         String tablePrefix = GenConfig.getTablePrefix();
         if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
         {
-            tableName = tableName.replaceFirst(tablePrefix, "");
+            String[] searchList = StringUtils.split(tablePrefix, ",");
+            String[] replacementList = emptyList(searchList.length);
+            tableName = StringUtils.replaceEach(tableName, searchList, replacementList);
         }
         return StringUtils.convertToCamelCase(tableName);
     }
@@ -216,4 +218,20 @@ public class GenUtils
             return 0;
         }
     }
+
+    /**
+     * 获取空数组列表
+     * 
+     * @param length 长度
+     * @return 数组信息
+     */
+    public static String[] emptyList(int length)
+    {
+        String[] values = new String[length];
+        for (int i = 0; i < length; i++)
+        {
+            values[i] = StringUtils.EMPTY;
+        }
+        return values;
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
index fedd7cf6..f3792cdc 100644
--- a/ruoyi-generator/src/main/resources/generator.yml
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -7,5 +7,5 @@ gen:
   packageName: com.ruoyi.system
   # 自动去除表前缀，默认是false
   autoRemovePre: false
-  # 表前缀(类名不会包含表前缀)
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
   tablePrefix: sys_
\ No newline at end of file