diff --git a/app/Admin/Services/AgreementService.php b/app/Admin/Services/AgreementService.php index 2ff7b1e..6f3c1ee 100644 --- a/app/Admin/Services/AgreementService.php +++ b/app/Admin/Services/AgreementService.php @@ -50,7 +50,7 @@ class AgreementService extends BaseService if ($user->can('admin.agreement.update') && $model->canUpdate()) { array_push($actions, 'edit'); } - if ($user->can('admin.agreement.delete') && $model->canUpdate()) { + if ($user->can('admin.agreement.delete')) { array_push($actions, 'delete'); } if ($user->can('admin.agreement.download') && in_array($model->workflow->check_status, [CheckStatus::Success])) { @@ -126,9 +126,6 @@ class AgreementService extends BaseService { $list = $this->query()->with(['workflow'])->whereIn('id', explode(',', $ids))->get(); foreach ($list as $item) { - if (!$model->canUpdate()) { - throw new RuntimeException('无法删除'); - } $item->delete(); } return true; diff --git a/app/Http/Resources/AgreementResource.php b/app/Http/Resources/AgreementResource.php index de156f6..dc47409 100644 --- a/app/Http/Resources/AgreementResource.php +++ b/app/Http/Resources/AgreementResource.php @@ -22,6 +22,9 @@ class AgreementResource extends JsonResource 'employee_id' => $this->employee_id, 'employee' => EmployeeResource::make($this->whenLoaded('employee')), + 'store_id' => $this->store_id, + 'store' => StoreResource::make($this->whenLoaded('store')), + 'workflow_check' => WorkflowCheckResource::make($this->whenLoaded('workflow')), 'created_at' => $this->created_at->timestamp, diff --git a/app/Http/Resources/WorkflowCheckResource.php b/app/Http/Resources/WorkflowCheckResource.php index a5590de..47a0721 100644 --- a/app/Http/Resources/WorkflowCheckResource.php +++ b/app/Http/Resources/WorkflowCheckResource.php @@ -35,7 +35,6 @@ class WorkflowCheckResource extends JsonResource { $model = Relation::getMorphedModel($type); $class = match ($model) { - 'agreements' => AgreementResource::class, default => 'App\\Http\\Resources\\'.class_basename($model).'Resource', }; diff --git a/app/Models/Agreement.php b/app/Models/Agreement.php index 163c3e9..ac2a976 100644 --- a/app/Models/Agreement.php +++ b/app/Models/Agreement.php @@ -33,6 +33,6 @@ class Agreement extends Model public function store() { - return $this->belongsTo(Store::class, 'employee_id'); + return $this->belongsTo(Store::class, 'store_id'); } }