From a95960a1ac450de8ee8048e975a5a6e216883af8 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 31 Jul 2024 13:40:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087554=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B--=E5=A4=96=E6=9D=A5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=9B=9E=E6=98=BE=E6=A0=87?= =?UTF-8?q?=E5=87=86=E4=B8=BA=E7=A9=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessStandardComplianceCheckServiceImpl.java | 8 ++++---- .../com/jero/modules/laws/standard/util/StandardUtil.java | 4 ++-- .../src/main/resources/i18n/messages_zh.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 7f9d793d..83431e26 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -1067,10 +1067,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl incompleteList = paService.list(wrapper); - return collect.stream().filter(e -> incompleteList.stream() - .noneMatch(i -> i.getProcessInstanceId().equals(e.getProcessInstanceId()))) - .map(ProcessStandardComplianceCheck::getStandardId) - .collect(Collectors.toList()); + List incompletePrcIdList = incompleteList.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); + // 筛选出未完成的流程对应的标准id + return collect.stream().filter(e -> incompletePrcIdList.contains(e.getProcessInstanceId())) + .map(ProcessStandardComplianceCheck::getStandardId).collect(Collectors.toList()); } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java index aa813c56..c4583f12 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java @@ -35,8 +35,8 @@ public class StandardUtil { Set doNotDeleteSet = new HashSet<>(data); // 检查交集，如果存在，则抛出异常 - for (String id : strings) { - if (doNotDeleteSet.contains(id)) { + for (String id : doNotDeleteSet) { + if (strings.contains(id)) { throw new JeroBootException(provider.getResultCommon()); } } diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 21779cde..cc3416f6 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -84,4 +84,4 @@ process.already.distributed=\u6D41\u7A0B\u5DF2\u5206\u53D1,\u7981\u6B62\u9A73\u5 process.not.countersignature=\u4E0D\u662F\u4F1A\u7B7E\u8282\u70B9\u4EFB\u52A1! zip_root_one_excel=\u538B\u7F29\u5305\u6839\u76EE\u5F55\u4E0B\u4EC5\u80FD\u5B58\u5728\u4E00\u4E2Aexcel\u4E3A\u5BFC\u5165\u6570\u636E message.no.exists.standard=\u6807\u51C6\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 -scc.delete.standard.error=\u6CD5\u89C4\u7B26\u5408\u6027\u6392\u67E5\u6D41\u7A0B\u6709\u6B63\u5728\u8FDB\u884C\u4E2D\u7684\u6D41\u7A0B\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 +scc.delete.standard.error=\u6709\u6B63\u5728\u8FDB\u884C\u4E2D\u7684\u6CD5\u89C4\u7B26\u5408\u6027\u6392\u67E5\u6D41\u7A0B\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664