瀏覽代碼

查询用户拥有的货主权限异常

yuang 4 年之前
父節點
當前提交
924c24ef4a
共有 2 個文件被更改,包括 9 次插入12 次删除
  1. 8 11
      app/Http/Controllers/KpiController.php
  2. 1 1
      app/Http/Controllers/PackageLogisticController.php

+ 8 - 11
app/Http/Controllers/KpiController.php

@@ -19,56 +19,53 @@ class KpiController extends Controller
         return view('kpi.day.index');
     }
 
-    public function dayDetailIndex()
+    public function dayDetailIndex(Request $request)
     {
         return view('kpi.dayDetail.index');
     }
 
-    public function dayDetailCustomer()
+    public function dayDetailCustomer(Request $request)
     {
         $owners = $this->getOwners();
         return view('kpi.dayDetailCustomer.index', compact('owners'));
     }
 
-    public function workCoefficientDayStatIndex()
+    public function workCoefficientDayStatIndex(Request $request)
     {
         $userWorkgroups = \App\UserWorkgroup::query()->select(["id", "name"])->get();
         return view('kpi.workCoefficientDayStat.index', compact('userWorkgroups'));
     }
 
-    public function ownerPcsReport()
+    public function ownerPcsReport(Request $request)
     {
         $ownerCodes = $this->getOwners()->pluck('code');
         return view('kpi.ownerPcsReport.index', compact('ownerCodes'));
 
     }
 
-    public function logisticsPunctuality()
+    public function logisticsPunctuality(Request $request)
     {
         $ownerIds = $this->getOwners()->pluck('id');
         return view('kpi.logisticsPunctuality.index', compact('ownerIds'));
     }
 
-    public function orderOperationLog()
+    public function orderOperationLog(Request $request)
     {
         $ownerIds = $this->getOwners()->pluck('id');
         return view('kpi.orderOperationLog.index', compact('ownerIds'));
     }
 
-    public function logisticReturnPunctuality()
+    public function logisticReturnPunctuality(Request $request)
     {
         $ownerIds = $this->getOwners()->pluck('id');
         return view('kpi.logisticReturnPunctuality.index', compact('ownerIds'));
     }
 
-    /**
-     * @return Builder[]|Collection
-     */
     public function getOwners()
     {
         /** @var UserService $userService */
         $userService = app('UserService');
-        $ownerIds = $userService->getPermittingOwnerIds(auth()->user());
+        $ownerIds = $userService->getUserHasOwners(auth()->id());
         $owners = \App\Owner::query()->select(['id', 'name', 'code'])->whereIn('id', $ownerIds)->get();
         return $owners;
     }

+ 1 - 1
app/Http/Controllers/PackageLogisticController.php

@@ -29,7 +29,7 @@ class PackageLogisticController extends Controller
         /** @var UserService $userService */
         $userService = app('UserService');
         /** @var array $owner_ids */
-        $owner_ids = $userService->getPermittingOwnerIds(auth()->user());
+        $owner_ids = $userService->getUserHasOwners(auth()->id());
         $owner_ids = array_map(function ($item) {
             return $item = (int)$item;
         }, $owner_ids);