From bb9bfeb8bc1a8b01bc5679336bc5ab06fc49030d Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 24 Aug 2021 14:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/OrderController.php              | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/AdminSupplier/Controllers/OrderController.php b/app/AdminSupplier/Controllers/OrderController.php
index 0d0aa8b..b7a1e58 100644
--- a/app/AdminSupplier/Controllers/OrderController.php
+++ b/app/AdminSupplier/Controllers/OrderController.php
@@ -33,7 +33,9 @@ class OrderController extends AdminController
 			$grid->disableEditButton();
 
 			$grid->model()->where(function ($query) {
-				return $query->whereHas('product', fn($q) => $q->where('supplier_id', Admin::user()->id));
+				return $query->whereHas('agentProductItem', function($query) {
+					return $query->where('supplier_id', Admin::user()->id);
+				});
 			});
 
 			$grid->column('id')->sortable();
@@ -88,13 +90,14 @@ class OrderController extends AdminController
 	 */
 	protected function detail($id)
 	{
-		return Show::make($id, new Order(['agent:id,name']), function (Show $show) {
+		return Show::make($id, new Order(['agent:id,name', 'agentProductItem']), function (Show $show) {
 			$show->disableDeleteButton();
 			$show->disableQuickEdit();
 			$show->disableEditButton();
 
 			//不允许查看非自己的数据
-			if ($show->model()->supplier_id != Admin::user()->id) {
+			$item_supplier_id = $show->model()->agentProductItem[0]->supplier_id ?? 0;
+			if ($item_supplier_id != Admin::user()->id) {
 				Admin::exit('数据不存在');
 			}
 
@@ -126,9 +129,10 @@ class OrderController extends AdminController
 	 */
 	protected function form()
 	{
-		return Form::make(new Order(), function (Form $form) {
+		return Form::make(new Order('agentProductItem'), function (Form $form) {
 			//不允许查看非自己的数据
-			if ($form->isEditing() && $form->model()->supplier_id != Admin::user()->id) {
+			$item_supplier_id = $form->model()->agentProductItem[0]->supplier_id ?? 0;
+			if ($form->isEditing() && $item_supplier_id != Admin::user()->id) {
 				return $form->response()->error('数据不存在');
 			}
 
@@ -140,7 +144,7 @@ class OrderController extends AdminController
 		})->saving(function (Form $form) {
 			return $form->response()->error('操作禁止');
 		})->deleting(function (Form $form) {
-			return $form->response()->error('禁止删除');
+			return $form->response()->error('操作禁止');
 		});
 	}
 }