From a35b32ef4df6248d0434a9591ad4b755f92e6eb6 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: Thu, 29 Aug 2024 10:40:47 +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=90=8D=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=20=E4=BD=BF=E7=94=A8=E5=BC=80=E5=A4=B4=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E8=AF=AF=E5=88=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/gen/service/GenTableServiceImpl.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
index dfa7e845..7638707b 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
@@ -137,7 +137,7 @@ public class GenTableServiceImpl implements IGenTableService {
         }
         // 过滤并转换表格数据
         List<GenTable> tables = tablesMap.values().stream()
-            .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+            .filter(x -> !startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
             .filter(x -> {
                 if (CollUtil.isEmpty(tableNames)) {
                     return true;
@@ -149,11 +149,11 @@ public class GenTableServiceImpl implements IGenTableService {
                 boolean commentMatches = true;
                 // 进行表名称的模糊查询
                 if (StringUtils.isNotBlank(tableName)) {
-                    nameMatches = StringUtils.startsWithIgnoreCase(x.getName(), tableName);
+                    nameMatches = StringUtils.containsIgnoreCase(x.getName(), tableName);
                 }
                 // 进行表描述的模糊查询
                 if (StringUtils.isNotBlank(tableComment)) {
-                    commentMatches = StringUtils.startsWithIgnoreCase(x.getComment(), tableComment);
+                    commentMatches = StringUtils.containsIgnoreCase(x.getComment(), tableComment);
                 }
                 // 同时匹配名称和描述
                 return nameMatches && commentMatches;
@@ -174,6 +174,16 @@ public class GenTableServiceImpl implements IGenTableService {
         return TableDataInfo.build(page);
     }
 
+    public static boolean startWithAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+        // 判断是否是以指定字符串开头
+        for (CharSequence searchCharSequence : searchCharSequences) {
+            if (StringUtils.startsWithIgnoreCase(cs, searchCharSequence)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * 查询据库列表
      *