diff --git a/itsm/ticket/tasks.py b/itsm/ticket/tasks.py index b8692371..a2442761 100644 --- a/itsm/ticket/tasks.py +++ b/itsm/ticket/tasks.py @@ -275,7 +275,7 @@ def retry_notify(ticket, state_id, receivers): @shared_task def notify_task(ticket, receivers, message, action, **kwargs): """发送通知""" - task_id = kwargs.get("task_id") + task_id = kwargs.pop("task_id", None) # 关闭通知服务 if CLOSE_NOTIFY == "close": diff --git a/itsm/ticket/utils.py b/itsm/ticket/utils.py index d08d394c..61b73db1 100644 --- a/itsm/ticket/utils.py +++ b/itsm/ticket/utils.py @@ -102,6 +102,9 @@ def build_message(_notify, task_id, ticket, message, action, **kwargs): else: custom_notify = get_custom_notify(ticket, action, _notify.type) + if task_id is not None: + kwargs["task_id"] = task_id + # 获取单据上下文 context = ticket.get_notify_context() context.update(