From 090ce628df6e46d9a70fcfc2570108c638371de6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 22 Aug 2024 10:12:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2089150=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B--?= =?UTF-8?q?=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA--=E5=88=86=E5=8F=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E3=80=81=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E3=80=81=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=EF=BC=8C=E8=BD=AC?= =?UTF-8?q?=E5=8A=9E=E5=90=8E=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/service/ProcessAllService.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 86a5ac4f..268eb995 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -119,6 +119,19 @@ public class ProcessAllService extends ServiceImpl processAll.setShowRejectTransition(YesOrNoEnum.NO.getValue()); } } + if (ProcessTypeEnum.STANDARD_COMPLIANCE_CHECK.getValue().equals(processAll.getPrcType())){ + // 是否显示驳回/转办 + // 查询是否存在子流程 + int count = processApprovalRecordService.count( + new LambdaQueryWrapper() + .eq(ProcessApprovalRecord::getProcessInstanceId, + processAll.getProcessInstanceId()) + .isNotNull(ProcessApprovalRecord::getParentTaskId)); + if (count > 0 && (ProcessStandardComplianceCheckConstants.MAIN_CHECK_USER_REDISTRIBUTE.equals(node) + || ProcessStandardComplianceCheckConstants.MAIN_CHECK_USER_DISTRIBUTE.equals(node))){ + processAll.setShowRejectTransition(YesOrNoEnum.NO.getValue()); + } + } } Set nodeIdSet = todoList.getRecords().stream().map(ProcessAll::getNodeId).collect(Collectors.toSet()); Set processDefinitionIdSet = todoList.getRecords().stream().map(ProcessAll::getProcessDefinitionId).collect(Collectors.toSet());