From d7b2f937971557906efac8467eeebf6c4cd7cd43 Mon Sep 17 00:00:00 2001 From: ganzizi Date: Fri, 21 Apr 2023 10:00:34 +0800 Subject: [PATCH] =?UTF-8?q?perf=20=E4=BC=98=E5=8C=96=E6=8A=84=E9=80=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/WorkflowController.php | 2 +- resources/views/push/bot.blade.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index b807c72d8..7480777ec 100755 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -916,7 +916,7 @@ class WorkflowController extends AbstractController 'start_time' => $process['var']['start_time'], 'end_time' => $process['var']['end_time'], ]; - $text = view('push.bot', ['type' => $type, 'action' => $action, 'data' => (object)$data])->render(); + $text = view('push.bot', ['type' => $type, 'action' => $action, 'is_finished' => $process['is_finished'], 'data' => (object)$data])->render(); $text = preg_replace("/^\x20+/", "", $text); $text = preg_replace("/\n\x20+/", "\n", $text); $msg_action = null; diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php index c6c846564..cc99f97fc 100755 --- a/resources/views/push/bot.blade.php +++ b/resources/views/push/bot.blade.php @@ -139,7 +139,11 @@ 开始时间:{{$data->start_time}} 结束时间:{{$data->end_time}}
+ @if ($is_finished == 1) + @else + + @endif
@elseif ($type === 'workflow_submitter') @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif