Merge pull request #1256 from hanshuaikang/feature/develop_by_han

fix: 修复单据被终止时依然发送单据完成通知的问题
TencentBlueKing · Jan 10, 2024 · 7c4596a · 7c4596a
2 parents 191ed19 + 7773370
commit 7c4596a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/itsm/ticket/models/ticket.py b/itsm/ticket/models/ticket.py
@@ -4257,13 +4257,14 @@ def do_before_end_pipeline(
 
         self.send_trigger_signal(CLOSE_TICKET)
 
-        self.notify(
-            state_id="",
-            receivers=self.creator,
-            message=_("您的单据已经完成！"),
-            action=FINISHED,
-            retry=False,
-        )
+        if close_status == FINISHED:
+            self.notify(
+                state_id="",
+                receivers=self.creator,
+                message=_("您的单据已经完成！"),
+                action=FINISHED,
+                retry=False,
+            )
         # 清理Token
         TicketFollowerNotifyLog._objects.filter(ticket_id=self.id).delete()
         return