diff --git a/app/Models/OrderItems.php b/app/Models/OrderItems.php index 3a906f4..350ffce 100755 --- a/app/Models/OrderItems.php +++ b/app/Models/OrderItems.php @@ -44,7 +44,7 @@ class OrderItems extends SoftDeletesModel public function product() { - return $this->hasOneThrough(Product::class, ProductItems::class, "id", "id", "product_item_id", "product_id"); + return $this->hasOneThrough(Product::class, ProductItems::class, "id", "id", "product_item_id", "product_id")->withTrashedParents(); } public function productItem() diff --git a/resources/views/admin/paramedic/index.blade.php b/resources/views/admin/paramedic/index.blade.php index f4742c4..8fbfb57 100755 --- a/resources/views/admin/paramedic/index.blade.php +++ b/resources/views/admin/paramedic/index.blade.php @@ -34,7 +34,7 @@ {{ $row->project->name }} - {{ $row->level->name }} + {{ $row->level ? $row->level->name : "" }} {{-- 专属二维码--}}