修复工单驳回无消息通知的问题 fix #634

hhyo · Feb 18, 2020 · b8bc33f · b8bc33f
1 parent 2148330
commit b8bc33f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sql/notify.py b/sql/notify.py
@@ -160,7 +160,7 @@ def notify_for_audit(audit_id, **kwargs):
             db_name,
             workflow_title,
             workflow_url,
-            workflow_audit_remark)
+            re.sub('[\r\n\f]{2,}', '\n', workflow_audit_remark))
     elif status == WorkflowDict.workflow_status['audit_abort']:  # 审核取消，通知所有审核人
         msg_title = "[{}]提交人主动终止工单#{}".format(workflow_type_display, audit_id)
         # 接收人，发送给该资源组内对应权限组所有的用户
@@ -177,7 +177,7 @@ def notify_for_audit(audit_id, **kwargs):
             db_name,
             workflow_title,
             workflow_url,
-            workflow_audit_remark)
+            re.sub('[\r\n\f]{2,}', '\n', workflow_audit_remark))
     else:
         raise Exception('工单状态不正确')
 

diff --git a/sql/sql_workflow.py b/sql/sql_workflow.py
@@ -551,10 +551,11 @@ def cancel(request):
         context = {'errMsg': msg}
         return render(request, 'error.html', context)
     else:
-        # 仅未审核通过又取消的工单需要发送消息，审核通过的不发送
+        # 发送取消、驳回通知
         audit_detail = Audit.detail_by_workflow_id(workflow_id=workflow_id,
                                                    workflow_type=WorkflowDict.workflow_type['sqlreview'])
-        if audit_detail.current_status == WorkflowDict.workflow_status['audit_abort']:
+        if audit_detail.current_status in (
+                WorkflowDict.workflow_status['audit_abort'], WorkflowDict.workflow_status['audit_reject']):
             async_task(notify_for_audit, audit_id=audit_detail.audit_id, audit_remark=audit_remark, timeout=60,
                        task_name=f'sqlreview-cancel-{workflow_id}')
     return HttpResponseRedirect(reverse('sql:detail', args=(workflow_id,)))