hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 12:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm

Browse Source
This commit is contained in:
jason
2024-10-21 10:15:09 +08:00
parent 8b1bc8cd01 ab36f5bedc
commit 4d02e29cbf
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
View File

@@ -211,8 +211,9 @@ public class SimpleModelUtils {
} }
} }
// 4. 如果是并行分支，包容分支，由于是程序创建的聚合网关，需要手工创建聚合网关和下一个节点的连线 // 4. 如果是并行分支、包容分支，由于是程序创建的聚合网关，需要手工创建聚合网关和下一个节点的连线
if (nodeType == BpmSimpleModelNodeType.PARALLEL_BRANCH_NODE || nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE ) { if (nodeType == BpmSimpleModelNodeType.PARALLEL_BRANCH_NODE
|| nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE ) {
String nextNodeId = isValidNode(childNode) ? childNode.getId() : targetNodeId; String nextNodeId = isValidNode(childNode) ? childNode.getId() : targetNodeId;
SequenceFlow sequenceFlow = buildBpmnSequenceFlow(branchEndNodeId, nextNodeId); SequenceFlow sequenceFlow = buildBpmnSequenceFlow(branchEndNodeId, nextNodeId);
process.addFlowElement(sequenceFlow); process.addFlowElement(sequenceFlow);
@@ -548,10 +549,6 @@ public class SimpleModelUtils {
} }
public static String buildGatewayJoinId(String id) {
return id + "_join";
}
public static class ConditionNodeConvert implements NodeConvert { public static class ConditionNodeConvert implements NodeConvert {
@Override @Override
@@ -607,4 +604,8 @@ public class SimpleModelUtils {
} }
private static String buildGatewayJoinId(String id) {
return id + "_join";
}
} }