|
@@ -94,9 +94,6 @@ public class ProcessEventListener implements ActivitiEventListener, Serializable
|
|
|
}
|
|
|
this.sendFlowFinishSms(tfCustomFlow.getType(), tfCustomFlowEntity, tfFlowApprove.getStatus(),
|
|
|
tfFlowLog);
|
|
|
- // ActivitiService activitiService = SpringContextHolder.getBean(ActivitiService.class);
|
|
|
- // activitiService.sendSopFlowDoneMsg(tfCustomFlow.getType(), tfCustomFlowEntity, tfFlowApprove, null,
|
|
|
- // FlowStatusEnum.FINISH.getTitle());
|
|
|
}
|
|
|
break;
|
|
|
case TASK_CREATED:
|
|
@@ -144,12 +141,8 @@ public class ProcessEventListener implements ActivitiEventListener, Serializable
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- //此处统一发送流程节点待办消息
|
|
|
- if ((tfCustomFlow.getType() == TFCustomTypeEnum.OFFICE_SOP_FLOW
|
|
|
- || tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW)
|
|
|
- && tfFlowLog.getApproveOperation() != FlowApproveOperationEnum.DRAFT
|
|
|
- && tfFlowLog.getApproveOperation() != FlowApproveOperationEnum.END) {
|
|
|
+
|
|
|
+ //此处统一发送流程节点待办消息
|
|
|
MemoryLock memoryLock = SpringContextHolder.getBean(MemoryLock.class);
|
|
|
String key = tfCustomFlowEntity.getCode() + tfFlowLog.getId();
|
|
|
boolean lock = memoryLock.lock(SystemConstant.LOCK_FLOW_TASK_MSG_PREFIX + key, key,
|