diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java index fbbcecb..c2dd02c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java @@ -117,11 +117,13 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - //或签 - if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { - flowTask.setCountersignOrSign(2);//或签 - } else { - flowTask.setCountersignOrSign(1);//会签 + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + //或签 + if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { + flowTask.setCountersignOrSign(2);//或签 + } else { + flowTask.setCountersignOrSign(1);//会签 + } } } }