导出权限共享

app/Http/Controllers/OrderController.php

@@ -4,20 +4,17 @@ namespace App\Http\Controllers;
 
 use App\Components\Database;
 use App\Http\Requests\OrderDelivering;
-use App\OracleActAllocationDetails;
 use App\OracleDOCOrderHeader;
 use App\OracleDOCWaveDetails;
 use App\OrderIssueType;
-use App\OrderPackage;
 use App\Services\LogisticService;
 use App\Services\LogService;
 use App\Services\OrderPackageService;
 use App\Services\OrderService;
 use App\Services\RejectedBillItemService;
 use App\Services\RejectedBillService;
-use Illuminate\Database\Eloquent\Builder;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
@@ -33,21 +30,6 @@ class OrderController extends Controller
         /** @var OrderService $orderService */
         $orderService = app('OrderService');
         $request = $request->input();
-        if (!app("UserService")->checkAdminIdentity(Auth::id())){
-            $owners = app('OwnerService')->getIntersectPermitting(['id', 'code']);
-            $codes = array_column($owners->toArray(), 'code');
-            if ($request['customerid'] ?? false) {
-                $arr = explode(',', $request['customerid']);
-                $request['customerid'] = [];
-                foreach ($arr as $value) {
-                    if (in_array($value, $codes)) $request['customerid'][] = $value;
-                }
-                if (count($request['customerid']) < 1) $request['customerid'] = [''];
-            } else $request['customerid'] = $codes;
-        }else if (isset($request['customerid'])){
-            $request['customerid'] = explode(',', $request['customerid']);
-            if ($request['customerid']<0)unset($request['customerid']);
-        }
         $service = app(LogisticService::class);
         $logistics = $service->getSelection(['id', 'name']);
         $result = $orderService->paginate($request);
@@ -64,6 +46,10 @@ class OrderController extends Controller
     }
 
     //导出
+
+    /**
+     * @throws \Exception|GuzzleException
+     */
     public function export(Request $request)
     {
         $is_merge = $request->is_merge ?? false;
@@ -74,6 +60,7 @@ class OrderController extends Controller
         if ($request->data) {
             $req["sql"] = $orderService->getSql(['data' => $request->data]);
         } else {
+            new OrderDelivering();
             $req["sql"] = $orderService->getSql($request->input());
         }
         $e = new Export();

app/Http/Requests/OrderDelivering.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Requests;
 
+use Illuminate\Support\Facades\Auth;
+
 class OrderDelivering extends GateRequest
 {
     public function __construct()
@@ -31,5 +33,22 @@ class OrderDelivering extends GateRequest
             $date = date('Y-m-d',strtotime("-{$increment} day"));
             request()->offsetSet("orderdate_start",$date." 00:00");
         }
+
+        if (!app("UserService")->checkAdminIdentity(Auth::id())){
+            $owners = app('OwnerService')->getIntersectPermitting(['id', 'code']);
+            $codes = array_column($owners->toArray(), 'code');
+            if (request()->has("customerid")) {
+                $arr = explode(',', request("customerid"));
+                $customer = [];
+                foreach ($arr as $value) {
+                    if (in_array($value, $codes)) $customer[] = $value;
+                }
+                if (count($customer) < 1) $customer = [''];
+                request()->offsetSet("customerid",$customer);
+            } else request()->offsetSet("customerid",$codes);
+        }else if (request()->has("customerid")){
+            $codes = explode(',', request("customerid"));
+            if ($codes<0)request()->offsetUnset("customerid");
+        }
     }
 }