订单权限BUG修复

app/Http/Controllers/OrderController.php

@@ -39,7 +39,7 @@ class OrderController extends Controller
         $orderService->tagOrderByOrderIssue($orders);
         app('WorkOrderService')->tagWorkOrder($orders);
         $commodities = $result['commodities'];
-        $customers = app(OwnerService::class)->getIntersectPermitting(['code','name']);
+        $customers = app(OwnerService::class)->getQuery()->select("code","name")->get();
         $page = $request["page"] ?? 1;
         $codes = DB::connection('oracle')->table('BAS_CODES')->select('code', 'codename_c')->where('codeid', 'SO_STS')->orderBy('code', 'asc')->get();
         $orderIssueType = OrderIssueType::all();

app/Http/Controllers/TestController.php

@@ -98,6 +98,7 @@ use App\Services\StorageService;
 use App\Services\StoreItemService;
 use App\Services\StoreService;
 use App\Services\SyriusTaskService;
+use App\Services\UserService;
 use App\Services\WorkOrderService;
 use App\SortingStation;
 use App\Station;
@@ -174,7 +175,15 @@ class TestController extends Controller
         dd($c($a));
     }
     public function test(Request $request)
-    {
+    {$user = User::query()->where("name","yanyuanmin")->first();
+        dd($user->id);
+        dd($codes = app('OwnerService')->getQuery($user->id)->select("code")->pluck("code"));
+
+
+        $ownerIds=app('UserService')->getPermittingOwnerIds($user);
+        $owners =  Owner::query()->select("id","name","code")->whereIn('id', $ownerIds)->whereNull('deleted_at')->get();
+        $codes = array_column($owners->toArray(), 'code');
+        dd($codes);
         dd(Order::class);
         $c = "test";
         $a = function ($b)use($c){

app/Http/Requests/OrderDelivering.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 
 class OrderDelivering extends GateRequest
@@ -35,8 +36,11 @@ class OrderDelivering extends GateRequest
         }
 
         if (!app("UserService")->checkAdminIdentity(Auth::id())){
-            $owners = app('OwnerService')->getIntersectPermitting(['id', 'code']);
-            $codes = array_column($owners->toArray(), 'code');
+            /**
+             * @var Builder $owners
+             */
+            $codes = app('OwnerService')->getQuery()->select("code")->pluck("code")->toArray();
+            if (count($codes)==0)$codes = [""];
             if (request("customerid")) {
                 $arr = explode(',', request("customerid"));
                 $customer = [];