临时工申请系统 修复权限问题

app/Http/Controllers/LaborApplyController.php

@@ -22,7 +22,10 @@ class LaborApplyController extends Controller
         $builder = LaborApply::query()
             ->filter($filters)
             ->with(['warehouse', 'userWorkGroup', 'applyUser']);
-        if (!(\auth()->user()->isSuperAdmin() || Gate::allows('宝时人事部'))) {
+        /** @var User $user */
+        $user = auth()->user();
+        $auth_user_is_人事主管 = $user->roles()->where('name', '人事主管')->exists();
+        if (!($user->isSuperAdmin() || $auth_user_is_人事主管)) {
             $builder->where('apply_user_id', \auth()->id());
         }
         $labor_applies = $builder

app/Http/Controllers/LaborCompanyDispatchController.php

@@ -20,11 +20,12 @@ class LaborCompanyDispatchController extends Controller
             ->filter($filters)
             ->with(['laborCompany', 'laborCompanyDispatchDetails']);
 
-        if (!(\auth()->user()->isSuperAdmin() || Gate::allows('宝时人事部'))) {
-            /** @var User $user */
-            $user = auth()->user();
+        /** @var User $user */
+        $user = auth()->user();
+        $auth_user_is_人事主管 = $user->roles()->where('name', '人事主管')->exists();
+        if (!($user->isSuperAdmin() || $auth_user_is_人事主管)) {
             //获取用户的劳务角色 劳务角色名 与 劳务所名称相同
-            $laborCompanyNames = $user->roles()->where('name', 'LIKE', '劳务')->pluck('name');
+            $laborCompanyNames = $user->roles()->where('name', 'LIKE', '%劳务%')->pluck('name');
             //根据劳务所名称相同 查询劳务所Id
             $laborCompanyIds = LaborCompany::query()->whereIn('name', $laborCompanyNames)->pluck('id');
             $builder->whereIn('labor_company_id', $laborCompanyIds);

resources/views/finance/settlementBills/storeOutFee/report/index.blade.php

@@ -81,7 +81,7 @@
                     <td class="m-0 p-0">
                         <table class="table table-striped table-sm m-0 p-0">
                             <tr v-for="item in report.data">
-                                <td>/</td>
+                                <td>@{{ item.step }}</td>
                             </tr>
                         </table>
                     </td>

resources/views/personnel/laborApply/dispatch/index.blade.php

@@ -21,7 +21,7 @@
                         </div>
                     </td>
                     <td class="">
-                        @can('劳务所')
+                        @can('人事管理-临时工申请协调-劳务派遣明细')
                             <div class="float-left ml-3" v-if="labor_company_dispatch.status==='人事确认'">
                                 <form :action="getBaseUrl(labor_company_dispatch) + '/laborCompanyReceivingOrder'"
                                       method="post"