From a85cb705274d8fbd9f5fba86ff1c39c13ac66de0 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 16 十月 2023 17:46:02 +0800 Subject: [PATCH] 1.用户加控制启用,停用状态 2.根据流水依赖获取最大流水值 --- Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java index 63e35bb..6502574 100644 --- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java +++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java @@ -199,17 +199,21 @@ flowTaskUserCi.setToTaskName(targetFlow.getName()); taskList.add(flowTaskUserCi); } - // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓烘帓浠栫綉鍏� - if (targetFlow instanceof ExclusiveGateway) { + // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓虹綉鍏� + if (targetFlow instanceof Gateway) { ExclusiveGateway exclusiveGateway = (ExclusiveGateway) targetFlow; List<SequenceFlow> exclusiveGatewayOutgoingFlows = exclusiveGateway.getOutgoingFlows(); for (SequenceFlow nexti:exclusiveGatewayOutgoingFlows){ String conditionExpression = nexti.getConditionExpression();//condition + String taskId = nexti.getTargetRef();//taskId String name = nexti.getName();//toName,椹冲洖銆佸悓鎰� - String taskName = taskMap.get(targetFlow.getId()); - + String taskName = taskMap.get(taskId); +//ExclusiveGateway + if(StringUtils.isEmpty(conditionExpression)){//姝ゆ椂鎺掍粬缃戝叧娌℃湁閰嶇疆娴佽浆鏉′欢 + continue; + } for (FlowTaskDTO flowTaskUserCi:mis){ if(taskId.equals(flowTaskUserCi.getTaskId())){ flowTaskUserCi.setCondition(conditionExpression); -- Gitblit v1.9.3