From 0d4df398f04044a4b3e534c1fe62a9246c9229d7 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Thu, 21 May 2026 10:12:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E5=85=BC?= =?UTF-8?q?=E5=AE=B9Oracle=E5=92=8CPgsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GardsSampleDataServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java index bceb6d57..c0f6d115 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java @@ -123,10 +123,11 @@ public class GardsSampleDataServiceImpl String ORIGINAL = "ORIGINAL"; String RNAUTO = "RNAUTO"; String RNMAN = "RNMAN"; - List suitable = ListUtil.toList(ORIGINAL, RNAUTO, RNMAN); + Set suitableSet = new HashSet<>(Arrays.asList(ORIGINAL, RNAUTO, RNMAN)); List ownerDtos = baseMapper.containSampleId("SAMPLE_ID").stream() - .filter(owner -> CollUtil.contains(suitable, owner.getOwner())) - .filter(owner -> StrUtil.contains(owner.getTableName(), "GARDS")) + .filter(owner -> Objects.nonNull(owner.getOwner())) + .filter(owner ->suitableSet.contains(owner.getOwner().toUpperCase())) + .filter(owner -> StrUtil.contains(owner.getTableName().toUpperCase(), "GARDS")) .collect(Collectors.toList()); String DOT = StrUtil.DOT; @@ -149,7 +150,7 @@ public class GardsSampleDataServiceImpl if (rnAuto) { // 收集自动处理库所有表名 List autoTables = ownerDtos.stream() - .filter(owner -> StrUtil.equals(owner.getOwner(), RNAUTO)) + .filter(owner -> StrUtil.equals(owner.getOwner().toUpperCase(), RNAUTO)) .map(owner -> owner.getOwner() + DOT + owner.getTableName()) .collect(Collectors.toList()); // 收集待删除文件路径 @@ -163,7 +164,7 @@ public class GardsSampleDataServiceImpl if (rnMan) { // 收集人工交互库所有表名 List manTables = ownerDtos.stream() - .filter(owner -> StrUtil.equals(owner.getOwner(), RNMAN)) + .filter(owner -> StrUtil.equals(owner.getOwner().toUpperCase(), RNMAN)) .map(owner -> owner.getOwner() + DOT + owner.getTableName()) .collect(Collectors.toList()); // 收集待删除文件路径