添加退货管理承运商权限访问

app/Services/RejectedService.php

@@ -8,6 +8,7 @@ use App\OracleDOCOrderHeader;
 use App\OrderIssue;
 use App\RejectedBill;
 use App\Services\common\QueryService;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use App\Traits\ServiceAppAop;
@@ -28,11 +29,18 @@ class RejectedService
     }
     private function  conditionQuery(array $param)
     {
-        $owners = Auth::user() ? (app('UserService')->getPermittingOwnerIds(Auth::user()) ?? []) : [];
+        $owners =  app("OwnerService")->getQuery()->select("id")->pluck("id")->toArray();
+        if (count($owners)==0){
+            $owners[] = [''];
+        }
         $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality',
             'items.packageImages','items.commodityImages','items.uploadFiles','orderIssueRejectedBill:logistic_number_return')
             ->orderBy('rejected_bills.id', 'desc')
-            ->whereIn('rejected_bills.id_owner', $owners);
+            ->where(function ($query)use ($owners){
+                /** @var Builder $query */
+                $query->whereIn('rejected_bills.id_owner', $owners)
+                    ->orWhereIn("id_logistic_return",app("LogisticService")->getQuery());
+            });
         if (array_search("397",$owners)!==false){
             $rejectedBills->with(["items.barcode.commodity"=>function($query){
                 $query->where("owner_id",397)->select("id","sku");