From 52889cb67a6cca05517c5cdb29a9dc8e65449e77 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Mon, 25 Oct 2021 11:03:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E9=82=AE=E4=BB=B6=E5=8F=8A=E6=8E=88=E6=9D=83=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tickets/handler/apply_application.py | 2 +-
 apps/tickets/handler/apply_asset.py       | 2 +-
 apps/tickets/handler/base.py              | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/tickets/handler/apply_application.py b/apps/tickets/handler/apply_application.py
index 9a504f39f..5cfc06e38 100644
--- a/apps/tickets/handler/apply_application.py
+++ b/apps/tickets/handler/apply_application.py
@@ -84,7 +84,7 @@ class Handler(BaseHandler):
         ).format(
             self.ticket.title,
             self.ticket.applicant_display,
-            str(self.ticket.processor),
+            ','.join([i['processor_display'] for i in self.ticket.process_map]),
             str(self.ticket.id)
         )
         permissions_data = {
diff --git a/apps/tickets/handler/apply_asset.py b/apps/tickets/handler/apply_asset.py
index 883c7f45b..f457efdba 100644
--- a/apps/tickets/handler/apply_asset.py
+++ b/apps/tickets/handler/apply_asset.py
@@ -77,7 +77,7 @@ class Handler(BaseHandler):
         ).format(
             self.ticket.title,
             self.ticket.applicant_display,
-            str(self.ticket.processor),
+            ','.join([i['processor_display'] for i in self.ticket.process_map]),
             str(self.ticket.id)
         )
 
diff --git a/apps/tickets/handler/base.py b/apps/tickets/handler/base.py
index 2bd674b0e..5e13b7a60 100644
--- a/apps/tickets/handler/base.py
+++ b/apps/tickets/handler/base.py
@@ -23,16 +23,18 @@ class BaseHandler(object):
 
     def _on_approve(self):
         if self.ticket.approval_step != len(self.ticket.process_map):
+            self._send_processed_mail_to_applicant(self.ticket.processor)
             self.ticket.approval_step += 1
             self.ticket.create_related_node()
             self._send_applied_mail_to_assignees()
             is_finished = False
         else:
+            self._send_processed_mail_to_applicant(self.ticket.processor)
             self.ticket.set_state_approve()
             self.ticket.set_status_closed()
             is_finished = True
 
-        self.__on_process(self.ticket.processor)
+        self.ticket.save()
         return is_finished
 
     def _on_reject(self):