From e469924bc90a437cc4c5d056ff6211d2a31dfb42 Mon Sep 17 00:00:00 2001 From: zhengweilin Date: Mon, 29 Jan 2024 11:34:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202.5.0:=201=E3=80=81I8DAMH=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BB=84=E7=AE=A1=E7=90=86=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=86=E5=8C=BA=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/GroupConfigServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java index b00c1bf6..e910c567 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java @@ -339,14 +339,14 @@ public class GroupConfigServiceImpl implements GroupConfigService { String schema = connection.getSchema(); // https://gitee.com/aizuda/easy-retry/issues/I8DAMH - String sql = MessageFormatter.arrayFormat("SELECT table_name\n" - + "FROM information_schema.tables\n" - + "WHERE table_name LIKE 'retry_task_%' AND table_schema = '{}' and table_catalog = '{}'", new Object[]{schema, catalog}).getMessage(); + String sql = MessageFormatter.arrayFormat("SELECT table_name\n" + + "FROM information_schema.tables\n" + + "WHERE table_name LIKE 'retry_task_%' AND (table_schema = '{}' OR table_schema = '{}' OR table_catalog = '{}' OR table_catalog = '{}')", new Object[]{schema, catalog, schema, catalog}).getMessage(); List tableList = jdbcTemplate.queryForList(sql, String.class); return tableList.stream().map(ReUtil::getFirstNumber).filter(i -> - !Objects.isNull(i) && i <= systemProperties.getTotalPartition()).distinct() - .collect(Collectors.toList()); + !Objects.isNull(i) && i <= systemProperties.getTotalPartition()).distinct() + .collect(Collectors.toList()); } catch (SQLException ignored) { } finally { if (Objects.nonNull(connection)) {