From 2d73011e2560060cbe76478e7ba120bbe7ea4fd9 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 23 Jan 2024 16:58:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B):=2080930?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessFbEntryChangeServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index b02cbaf2..cf4e27ec 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -455,16 +455,23 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl idList = list.stream().map(ProcessFbEntryChange::getId).collect(Collectors.toList()); - int count = processAllService.count( + List processAllList = processAllService.list( new LambdaQueryWrapper() .in(ProcessAll::getProjectId, idList) .eq(ProcessAll::getPrcStatus, "1")); - int size = processDraftService.count(new LambdaQueryWrapper() + List processDraftList = processDraftService.list(new LambdaQueryWrapper() .in(ProcessDraft::getProjectId, idList) .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") .or().isNull(ProcessDraft::getSaveSource))); - if (count > 0 || size > 0) { - throw new JeroBootException("标准编号在标准法规变更流程进行中，不可删除！"); + if (!processAllList.isEmpty() || !processDraftList.isEmpty()) { + List processAllProjectIds = processAllList.stream().map(ProcessAll::getProjectId).collect(Collectors.toList()); + List processDraftProjectIds = processDraftList.stream().map(ProcessDraft::getProjectId).collect(Collectors.toList()); + processAllProjectIds.addAll(processDraftProjectIds); + processAllProjectIds = processDraftProjectIds.stream().distinct().collect(Collectors.toList()); + List finalProcessAllProjectIds = processAllProjectIds; + String standardNumbers = list.stream().filter(v -> finalProcessAllProjectIds.contains(v.getId())) + .map(ProcessFbEntryChange::getStandardNumber).collect(Collectors.joining(",")); + throw new JeroBootException("标准编号为：" + standardNumbers +"在标准法规变更流程进行中，不可删除！"); } }