diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index 8236d89..e14aaf4 100644 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -98,9 +98,7 @@ class WorkflowController extends Controller break; } - $data = $resource::make($info)->toArray($request); - $data['checkable'] = $checkable; - return $data; + return ['data' => $resource::make($info), 'checkable' => $checkable]; } public function logs($id, Request $request) diff --git a/app/Traits/HasCheckable.php b/app/Traits/HasCheckable.php index 63f6cc1..a50c618 100644 --- a/app/Traits/HasCheckable.php +++ b/app/Traits/HasCheckable.php @@ -18,9 +18,9 @@ trait HasCheckable }); static::deleting(function ($model) { - // 删除审核流水记录 - $model->workflow->logs()->delete(); // 删除审核流程 + $model->workflow->logs()->delete(); + // 删除审核申请 $model->workflow->delete(); }); }