From 0870ccf4d86189087bb8b384a8f48df4918cb99a Mon Sep 17 00:00:00 2001
From: ganzizi <zhicheng123@126.com>
Date: Tue, 20 Jun 2023 16:59:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BA=BA=E5=91=98=E5=A7=93=E5=90=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ApproveController.php | 1 +
 resources/views/push/bot.blade.php             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php
index 5e3cdfa8d..555e7ecf4 100755
--- a/app/Http/Controllers/Api/ApproveController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -952,6 +952,7 @@ class ApproveController extends AbstractController
         $data = [
             'id' => $process['id'],
             'nickname' => User::userid2nickname($type == 'approve_submitter' ? $toUser['userid'] : $process['start_user_id']),
+            'start_nickname' => User::userid2nickname($process['start_user_id']),
             'proc_def_name' => $process['proc_def_name'],
             'department' => $process['department'],
             'type' => $process['var']['type'],
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index a951056ef..ed9c10706 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -147,7 +147,7 @@
     </div></span>
 @elseif ($type === 'approve_submitter')
     <span class="open-approve-details" data-id="{{$data->id}}"><b> @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>
-    <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
+    <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->start_nickname}}</span> {{$data->department}}</span>
         <b>审批事由</b>
         @if ($data->type)
         <span>假期类型：{{$data->type}}</span>