From b4db53891d584e2424beb6c6c29c910f2c705bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Fri, 14 Jun 2024 17:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 818e19b102e21c4f60d15bedd6a4d48b3711851d)
---
 pigx-visual/pigx-codegen/pom.xml                           | 2 +-
 .../pigx/codegen/service/impl/GenTableServiceImpl.java     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index e340c0b6c..034cb2a41 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -16,7 +16,7 @@
 
     <properties>
         <magic.version>2.0.2</magic.version>
-        <screw.version>0.0.4</screw.version>
+        <screw.version>0.0.5</screw.version>
         <db2.version>11.5.0.0</db2.version>
         <anyline.version>8.7.1-jdk17-20232101</anyline.version>
         <configuration.version>1.10</configuration.version>
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
index 75c0f4e57..24e4744b2 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
@@ -111,7 +111,12 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(table.getDsName());
         List<Table> tableList = ServiceProxy.metadata().tables().values().stream()
-                .filter(t -> StrUtil.containsIgnoreCase(t.getTableName(), table.getTableName())).toList();
+                .filter(t -> {
+                    if (StrUtil.isBlank(table.getTableName())) {
+                        return true;
+                    }
+                    return StrUtil.containsIgnoreCase(t.getName(false), table.getTableName());
+                }).toList();
 
         // 根据 page 进行分页
         List<Table> records = CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tableList);