diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index 0ae2502..23243db 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -126,7 +126,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('操作禁止'); }); } } diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index 1fbe0a3..a835f50 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -298,7 +298,7 @@ class AgentProductController extends AdminController } })->deleting(function (Form $form) { //不允许删除非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } }); diff --git a/app/AdminAgent/Controllers/CategoryController.php b/app/AdminAgent/Controllers/CategoryController.php index 7de0f71..1870ed6 100644 --- a/app/AdminAgent/Controllers/CategoryController.php +++ b/app/AdminAgent/Controllers/CategoryController.php @@ -104,7 +104,7 @@ class CategoryController extends AdminController $form->sort = $form->sort ?? 255; })->deleting(function (Form $form) { //不允许修改非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } diff --git a/app/AdminAgent/Controllers/MessageController.php b/app/AdminAgent/Controllers/MessageController.php index 3512a60..3813198 100644 --- a/app/AdminAgent/Controllers/MessageController.php +++ b/app/AdminAgent/Controllers/MessageController.php @@ -119,7 +119,7 @@ class MessageController extends AdminController $form->ignore(['id', 'status', 'created_at', 'updated_at', 'deleted_at']); })->deleting(function (Form $form) { //不允许删除非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } }); diff --git a/app/AdminAgent/Controllers/NoticeController.php b/app/AdminAgent/Controllers/NoticeController.php index e2616b5..aa7eb0c 100644 --- a/app/AdminAgent/Controllers/NoticeController.php +++ b/app/AdminAgent/Controllers/NoticeController.php @@ -93,7 +93,7 @@ class NoticeController extends AdminController $form->ignore(['id', 'created_at', 'updated_at']); })->deleting(function (Form $form) { //不允许删除非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } }); diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php index a9e9699..453d519 100644 --- a/app/AdminAgent/Controllers/OrderController.php +++ b/app/AdminAgent/Controllers/OrderController.php @@ -184,7 +184,7 @@ class OrderController extends AdminController return $form->response()->error('请通过订单列表的”通过“和”拒绝“按钮来审核退款'); } })->deleting(function (Form $form) { - return $form->response()->error('禁止删除'); + return $form->response()->error('操作禁止'); }); } } diff --git a/app/AdminAgent/Controllers/SlideController.php b/app/AdminAgent/Controllers/SlideController.php index 2457efd..33e7f80 100644 --- a/app/AdminAgent/Controllers/SlideController.php +++ b/app/AdminAgent/Controllers/SlideController.php @@ -126,7 +126,7 @@ class SlideController extends AdminController $form->ignore(['id', 'created_at', 'updated_at']); })->deleting(function (Form $form) { //不允许删除非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } }); diff --git a/app/AdminAgent/Controllers/SpecialController.php b/app/AdminAgent/Controllers/SpecialController.php index 5688d1c..8781c25 100644 --- a/app/AdminAgent/Controllers/SpecialController.php +++ b/app/AdminAgent/Controllers/SpecialController.php @@ -145,7 +145,7 @@ class SpecialController extends AdminController $form->ignore(['id', 'agent_id', 'created_at', 'updated_at']); })->deleting(function (Form $form) { //不允许删除非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } }); diff --git a/app/AdminAgent/Controllers/UserController.php b/app/AdminAgent/Controllers/UserController.php index a0fb750..ac410f0 100644 --- a/app/AdminAgent/Controllers/UserController.php +++ b/app/AdminAgent/Controllers/UserController.php @@ -114,7 +114,7 @@ class UserController extends AdminController //不允许编辑的字段 $form->ignore(['id', 'agent_id', 'nickname', 'deleted_at']); })->deleting(function (Form $form) { - return $form->response()->error('禁止删除'); + return $form->response()->error('操作禁止'); }); } } diff --git a/app/AdminAgent/Controllers/WaterfallAdController.php b/app/AdminAgent/Controllers/WaterfallAdController.php index 230fbe1..fffd0cb 100644 --- a/app/AdminAgent/Controllers/WaterfallAdController.php +++ b/app/AdminAgent/Controllers/WaterfallAdController.php @@ -122,7 +122,7 @@ class WaterfallAdController extends AdminController $form->ignore(['id', 'created_at', 'updated_at']); })->deleting(function (Form $form) { //不允许删除非自己的数据 - if ($form->model()[0]['agent_id'] != Admin::user()->id) { + if (array_filter($form->model()->toArray(), fn($v) => $v['agent_id'] != Admin::user()->id)) { return $form->response()->error('数据不存在'); } }); diff --git a/app/AdminSupplier/Controllers/AgentController.php b/app/AdminSupplier/Controllers/AgentController.php index 9f15d85..00aebe3 100644 --- a/app/AdminSupplier/Controllers/AgentController.php +++ b/app/AdminSupplier/Controllers/AgentController.php @@ -103,9 +103,9 @@ class AgentController extends AdminController $form->display('id'); })->saving(function (Form $form) { - return $form->response()->error('禁止操作'); + return $form->response()->error('操作禁止'); })->deleting(function (Form $form) { - return $form->response()->error('禁止删除'); + return $form->response()->error('操作禁止'); }); } } diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index afb3316..42e97e8 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -129,9 +129,9 @@ class ProductController extends AdminController ->update(['status' => ProductStatus::SOLD_OUT]); } })->deleting(function (Form $form) { - //这里获取字段值和saving不同 - if ($form->model()[0]['supplier_id'] != Admin::user()->id) { - return $form->response()->error('删除失败'); + //不允许删除非自己的数据 + if (array_filter($form->model()->toArray(), fn($v) => $v['supplier_id'] != Admin::user()->id)) { + return $form->response()->error('数据不存在'); } }); }