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 @@ @elseif ($type === 'approve_submitter') @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif -
申请人:{{'@'}}{{$data->nickname}} {{$data->department}} +
申请人:{{'@'}}{{$data->start_nickname}} {{$data->department}} 审批事由 @if ($data->type) 假期类型:{{$data->type}}