REQ-2596-修复自动过审条件判断错误问题
This commit is contained in:
parent
ada988a158
commit
9b55b354e6
@ -56,7 +56,9 @@ public class CheckApproverServiceImpl implements CheckApproverService {
|
||||
BpmnFlowNodeType currentNodeType = BpmnMetaParserHelper.getNodeType(currentFlowElement).orElse(NODE_EMPTY);
|
||||
//业务节点,指定业务审批人,或者业务设置了审批人,也要参与自动过审,node_type为NODE_BUSINESS,节点元素类型为UserTask
|
||||
//业务节点审批人为空,或者人员未指定,此时不进行自动过审操作,需要再业务指定审批人后,再做自动过审动作
|
||||
if (!Objects.equals(currentNodeType, NODE_TASK) && !Objects.equals(currentNodeType, NODE_BUSINESS) && !StringUtils.hasText(delegateTask.getAssignee()) && delegateTask.getAssignee().equals(NO_ASSIGNEE)) {
|
||||
if (!(Objects.equals(currentNodeType, NODE_TASK) || Objects.equals(currentNodeType, NODE_BUSINESS)) ||
|
||||
!StringUtils.hasText(delegateTask.getAssignee()) ||
|
||||
delegateTask.getAssignee().equals(NO_ASSIGNEE)) {
|
||||
return exists.get();
|
||||
}
|
||||
Optional<BpmnButtonConf> optConfig = BpmnMetaParserHelper.getButtonConfig(mainProcess, delegateTask.getTaskDefinitionKey());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user