Commit 3265df7548769975a20eb600b6f0a0a216ae3b7f
1 parent
c68ab33d
fix: 修复流程预测节点错误问题
fix: 补充校验规则,流程创建时只校验预测节点的审批人是否配置
Showing
1 changed file
with
5 additions
and
5 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
| @@ -210,9 +210,9 @@ public class BpmnModelUtils { | @@ -210,9 +210,9 @@ public class BpmnModelUtils { | ||
| 210 | /** | 210 | /** |
| 211 | * 给节点添加用户任务的审批人为空时,处理类型枚举 | 211 | * 给节点添加用户任务的审批人为空时,处理类型枚举 |
| 212 | * | 212 | * |
| 213 | + * @see BpmUserTaskAssignEmptyHandlerTypeEnum | ||
| 213 | * @param emptyHandler 空处理 | 214 | * @param emptyHandler 空处理 |
| 214 | * @param userTask 任务节点 | 215 | * @param userTask 任务节点 |
| 215 | - * @see BpmUserTaskAssignEmptyHandlerTypeEnum | ||
| 216 | */ | 216 | */ |
| 217 | public static void addAssignEmptyHandlerType(BpmSimpleModelNodeVO.AssignEmptyHandler emptyHandler, UserTask userTask) { | 217 | public static void addAssignEmptyHandlerType(BpmSimpleModelNodeVO.AssignEmptyHandler emptyHandler, UserTask userTask) { |
| 218 | if (emptyHandler == null) { | 218 | if (emptyHandler == null) { |
| @@ -256,7 +256,7 @@ public class BpmnModelUtils { | @@ -256,7 +256,7 @@ public class BpmnModelUtils { | ||
| 256 | * 给节点添加表单字段权限元素 | 256 | * 给节点添加表单字段权限元素 |
| 257 | * | 257 | * |
| 258 | * @param fieldsPermissions 表单字段权限 | 258 | * @param fieldsPermissions 表单字段权限 |
| 259 | - * @param flowElement 节点 | 259 | + * @param flowElement 节点 |
| 260 | */ | 260 | */ |
| 261 | public static void addFormFieldsPermission(List<Map<String, String>> fieldsPermissions, FlowElement flowElement) { | 261 | public static void addFormFieldsPermission(List<Map<String, String>> fieldsPermissions, FlowElement flowElement) { |
| 262 | if (CollUtil.isNotEmpty(fieldsPermissions)) { | 262 | if (CollUtil.isNotEmpty(fieldsPermissions)) { |
| @@ -762,9 +762,9 @@ public class BpmnModelUtils { | @@ -762,9 +762,9 @@ public class BpmnModelUtils { | ||
| 762 | 762 | ||
| 763 | // 情况:StartEvent/EndEvent/UserTask/ServiceTask | 763 | // 情况:StartEvent/EndEvent/UserTask/ServiceTask |
| 764 | if (currentElement instanceof StartEvent | 764 | if (currentElement instanceof StartEvent |
| 765 | - || currentElement instanceof EndEvent | ||
| 766 | - || currentElement instanceof UserTask | ||
| 767 | - || currentElement instanceof ServiceTask) { | 765 | + || currentElement instanceof EndEvent |
| 766 | + || currentElement instanceof UserTask | ||
| 767 | + || currentElement instanceof ServiceTask) { | ||
| 768 | // 添加元素 | 768 | // 添加元素 |
| 769 | FlowNode flowNode = (FlowNode) currentElement; | 769 | FlowNode flowNode = (FlowNode) currentElement; |
| 770 | resultElements.add(flowNode); | 770 | resultElements.add(flowNode); |