From ad7b42db451e9296779609ed019c83f1fbf043d9 Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 24 Sep 2025 17:43:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E8=BD=B4?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/ApprovalRecordsController.php | 7 ++++--- app/common/service/ApprovalRecordsService.php | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/ApprovalRecordsController.php b/app/admin/controller/ApprovalRecordsController.php index 27f9fb2..1862dfe 100644 --- a/app/admin/controller/ApprovalRecordsController.php +++ b/app/admin/controller/ApprovalRecordsController.php @@ -186,14 +186,15 @@ class ApprovalRecordsController extends BaseController protected function timelineFormat($data) - { + { $result = []; foreach ($data as $record) { $result[] = [ 'id' => $record['id'], 'name' => $record['approver']['name'], - 'comment' => $record['comment'], - 'time' => $record['updated_at'] + 'comment' => $record['comment'] ?? '', + 'time' => $record['updated_at'], + 'status_desc' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'), ]; } return $result; diff --git a/app/common/service/ApprovalRecordsService.php b/app/common/service/ApprovalRecordsService.php index 3be5881..b1bc4ba 100644 --- a/app/common/service/ApprovalRecordsService.php +++ b/app/common/service/ApprovalRecordsService.php @@ -176,6 +176,9 @@ class ApprovalRecordsService public function serviceApprovalTimeline(Request $request, array $data = []) { $instance = \app\common\model\ApprovalInstances::where('biz_id', $data['id'])->where('flow_type', $data['flow_type'])->first(); + if (!$instance) { + return []; + } $result = \app\common\model\ApprovalRecords::where('instance_id', $instance->id)->with('approver')->orderBy('id', 'desc')->get(); return $result; }