From 661751f9ba0a93cd0ba4f1deeaa1796a783b4308 Mon Sep 17 00:00:00 2001 From: weizong song Date: Mon, 6 May 2024 10:51:02 +0800 Subject: [PATCH 1/4] up --- app/Models/OrderItems.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From 4cc9b9e6fe518f7aba208af52af1458e968f7f6d Mon Sep 17 00:00:00 2001 From: weizong song Date: Mon, 6 May 2024 10:56:57 +0800 Subject: [PATCH 2/4] up --- app/Models/OrderItems.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/OrderItems.php b/app/Models/OrderItems.php index 350ffce..3a906f4 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")->withTrashedParents(); + return $this->hasOneThrough(Product::class, ProductItems::class, "id", "id", "product_item_id", "product_id"); } public function productItem() From 50979afce23390d18b4950fca7105da3ccfacb15 Mon Sep 17 00:00:00 2001 From: weizong song Date: Mon, 6 May 2024 10:58:08 +0800 Subject: [PATCH 3/4] up --- app/Models/OrderItems.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From bf9ad920c26ffe14f27cb2be2d570d720aa19b98 Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 8 May 2024 10:37:27 +0800 Subject: [PATCH 4/4] up --- resources/views/admin/paramedic/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 : "" }} {{-- 专属二维码--}}