主分支驳回到并行网关

如果并行网关中存在排他网关，会导致递归中断，导致无法找到分支网关的结束网关，最终补全的execution记录中没有ACT_ID_，会卡在结束网关

```java
if (targetFlowElement instanceof UserTask) {
                UserTask task = (UserTask) targetFlowElement;
                boolean eligible = true;
                if (dto.getUserTaskModels().containsKey(task.getId())) {
                    eligible = false;
                }
                if (StringUtils.isNotBlank(limitQuery.getCategory()) && !limitQuery.getCategory().equals(task.getCategory())) {
                    eligible = false;
                }
                if (StringUtils.isNotBlank(limitQuery.getTaskDefKey()) && !limitQuery.getTaskDefKey().equals(task.getId())) {
                    eligible = false;
                }
                if (StringUtils.isNotBlank(limitQuery.getNodeType()) && !limitQuery.getNodeType().equals(UserTaskAttrUtil.getAttr(task, UserTaskAttrUtil.NODE_TYPE_KEY))) {
                    eligible = false;
                }
                if (eligible) {
                    BpmTaskModelEntity userTaskModelEntity = new BpmTaskModelEntity();
                    // 设置 BpmTaskModelEntity 值
                    convorBpmTaskModelEntity(userTaskModelEntity, dto, task);
                    dto.getUserTaskModels().put(task.getId(), userTaskModelEntity);
                }
                // 递归取下面的节点
                loopForkParallelGateway(limitQuery, dto, ((FlowNode) targetFlowElement).getOutgoingFlows(), forkGatewayMap, flowElementMap);
            }
            if (targetFlowElement instanceof ParallelGateway || targetFlowElement instanceof InclusiveGateway) {
                Gateway gateway = (Gateway) targetFlowElement;
                // 遇到新的并行网关节点
                // 从 fork网关节点开始查找
                if (gateway.getOutgoingFlows().size() > 1) {
                    ParallelGatwayDTO childDto = forkGatewayMap.get(gateway.getId());
                    if (childDto == null) {
                        childDto = new ParallelGatwayDTO();
                        childDto.setTenantId(dto.getTenantId());
                        childDto.setProcDefId(dto.getProcDefId());
                    }
                    childDto.setForkSize(gateway.getOutgoingFlows().size());
                    childDto.setForkId(targetFlowElement.getId());
                    dto.getChildParallelGatways().add(childDto);
                    childDto.setParentParallelGatwayDTO(dto);
                    forkGatewayMap.put(targetFlowElement.getId(), childDto);
                    // 递归取下面的节点
                    loopForkParallelGateway(limitQuery, childDto, gateway.getOutgoingFlows(), forkGatewayMap, flowElementMap);
                } else if (gateway.getIncomingFlows().size() > 1 && gateway.getOutgoingFlows().size() == 1) {
                    // 遇到新的join类型的并行网关节点，此时dto为前面与之对应的fork并行网关节点
                    dto.setJoinId(gateway.getId());
                    dto.getUserTaskModels().forEach((k, v) -> v.setJoinParallelGatewayId(gateway.getId()));

if (dto.getParentParallelGatwayDTO() == null) {
                        // 本并行网关里面的用户任务递归完毕
                        break;
                    }
                    // 继续父并行网关的递归取
                    loopForkParallelGateway(limitQuery, dto.getParentParallelGatwayDTO(), gateway.getOutgoingFlows(), forkGatewayMap, flowElementMap);
                }
            }
```

试试这样修改

```
            if (targetFlowElement instanceof ParallelGateway || targetFlowElement instanceof InclusiveGateway
                   || targetFlowElement instanceof ExclusiveGateway) {
                Gateway gateway = (Gateway) targetFlowElement;
                // 遇到新的并行网关节点
                // 从 fork网关节点开始查找
                if (gateway.getOutgoingFlows().size() > 1) {
                    ParallelGatwayDTO childDto = forkGatewayMap.get(gateway.getId());
                    if (childDto == null) {
                        childDto = new ParallelGatwayDTO();
                        childDto.setTenantId(dto.getTenantId());
                        childDto.setProcDefId(dto.getProcDefId());
                    }
                    childDto.setForkSize(
                        targetFlowElement instanceof ExclusiveGateway 
                        ? 1 : gateway.getOutgoingFlows().size());
                    childDto.setForkId(targetFlowElement.getId());
                    dto.getChildParallelGatways().add(childDto);
                    childDto.setParentParallelGatwayDTO(dto);
                    forkGatewayMap.put(targetFlowElement.getId(), childDto);
                    // 递归取下面的节点
                    loopForkParallelGateway(limitQuery, childDto, gateway.getOutgoingFlows(), forkGatewayMap, flowElementMap);
                } else if (gateway.getIncomingFlows().size() > 1 && gateway.getOutgoingFlows().size() == 1) {
                    // 遇到新的join类型的并行网关节点，此时dto为前面与之对应的fork并行网关节点
                    dto.setJoinId(gateway.getId());
                    dto.getUserTaskModels().forEach((k, v) -> v.setJoinParallelGatewayId(gateway.getId()));

banana/bpm2-boot-starter

内容风险标识

评论 (1)