Commit e5aede6265bdbc77a6d9491c4e7660491c3ffcbe
1 parent
0085b425
feat: 办理人节点高亮处理
Showing
2 changed files
with
4 additions
and
2 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
| @@ -792,10 +792,11 @@ public class SimpleModelUtils { | @@ -792,10 +792,11 @@ public class SimpleModelUtils { | ||
| 792 | BpmSimpleModelNodeTypeEnum nodeType = BpmSimpleModelNodeTypeEnum.valueOf(currentNode.getType()); | 792 | BpmSimpleModelNodeTypeEnum nodeType = BpmSimpleModelNodeTypeEnum.valueOf(currentNode.getType()); |
| 793 | Assert.notNull(nodeType, "模型节点类型不支持"); | 793 | Assert.notNull(nodeType, "模型节点类型不支持"); |
| 794 | 794 | ||
| 795 | - // 情况:START_NODE/START_USER_NODE/APPROVE_NODE/COPY_NODE/END_NODE | 795 | + // 情况:START_NODE/START_USER_NODE/APPROVE_NODE/COPY_NODE/END_NODE/TRANSACTOR_NODE |
| 796 | if (nodeType == BpmSimpleModelNodeTypeEnum.START_NODE | 796 | if (nodeType == BpmSimpleModelNodeTypeEnum.START_NODE |
| 797 | || nodeType == BpmSimpleModelNodeTypeEnum.START_USER_NODE | 797 | || nodeType == BpmSimpleModelNodeTypeEnum.START_USER_NODE |
| 798 | || nodeType == BpmSimpleModelNodeTypeEnum.APPROVE_NODE | 798 | || nodeType == BpmSimpleModelNodeTypeEnum.APPROVE_NODE |
| 799 | + || nodeType == BpmSimpleModelNodeTypeEnum.TRANSACTOR_NODE | ||
| 799 | || nodeType == BpmSimpleModelNodeTypeEnum.COPY_NODE | 800 | || nodeType == BpmSimpleModelNodeTypeEnum.COPY_NODE |
| 800 | || nodeType == BpmSimpleModelNodeTypeEnum.END_NODE) { | 801 | || nodeType == BpmSimpleModelNodeTypeEnum.END_NODE) { |
| 801 | // 添加元素 | 802 | // 添加元素 |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
| @@ -479,7 +479,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -479,7 +479,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 479 | // 1. 开始节点/审批节点 | 479 | // 1. 开始节点/审批节点 |
| 480 | if (ObjectUtils.equalsAny(node.getType(), | 480 | if (ObjectUtils.equalsAny(node.getType(), |
| 481 | BpmSimpleModelNodeTypeEnum.START_USER_NODE.getType(), | 481 | BpmSimpleModelNodeTypeEnum.START_USER_NODE.getType(), |
| 482 | - BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType())) { | 482 | + BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType(), |
| 483 | + BpmSimpleModelNodeTypeEnum.TRANSACTOR_NODE.getType())) { | ||
| 483 | List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, node.getId(), | 484 | List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, node.getId(), |
| 484 | startUserId, processDefinitionInfo.getProcessDefinitionId(), processVariables); | 485 | startUserId, processDefinitionInfo.getProcessDefinitionId(), processVariables); |
| 485 | activityNode.setCandidateUserIds(candidateUserIds); | 486 | activityNode.setCandidateUserIds(candidateUserIds); |