人事权限问题

app/Http/Controllers/PersonnelController.php

@@ -64,7 +64,7 @@ class PersonnelController extends Controller
 
     //打卡审核
     public function storeClockAudit(Request $request){
-        if(!Gate::allows('人事管理-打卡审核')){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
+        if(!Gate::allows('人事管理-门卫审核')){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
         $id=$request->input('id');
         $type=$request->input('type');
         $userDutyCheck=UserDutyCheck::find($id);
@@ -162,16 +162,16 @@ class PersonnelController extends Controller
         $user=Auth::user();
         if (!$user)return redirect('/');
         $userWorkgroupIds=$user->getPermittingWorkgroupIds();
-        $users=User::whereHas("userWorkgroups",function (Builder $query)use(&$userWorkgroupIds){
-            $query->whereIn("id",$userWorkgroupIds);
-        })->get();
+//        $users=User::whereHas("userWorkgroups",function (Builder $query)use(&$userWorkgroupIds){
+//            $query->whereIn("id",$userWorkgroupIds);
+//        })->get();
         $permittingWorkgroups=UserWorkgroup::whereIn('id',$userWorkgroupIds)->get();
         if($permittingWorkgroups->isEmpty())$permittingWorkgroups="\'\'";
 
-        $user_ids=array_column($users->toArray(),'id');
+//        $user_ids=array_column($users->toArray(),'id');
         $dateNow=Carbon::now()->addDays(1)->format('Y-m-d');
         $beforeYesterdayDate=Carbon::now()->addDays(-2)->format('Y-m-d');
-        $userDutyChecks=UserDutyCheck::with(['userWorkgroup','userLabor.laborCompany','userDetail'])->whereIn("user_id",$user_ids)
+        $userDutyChecks=UserDutyCheck::with(['userWorkgroup','userLabor.laborCompany','userDetail'])->whereIn("workgroup_id",$userWorkgroupIds)
             ->whereBetween('checked_at',[$beforeYesterdayDate,$dateNow])->orderBy('checked_at','DESC')->get();
         $laravelEchoPrefix = config('database.redis.options.prefix');
         return view('personnel/checking-in/clockAudit',['userDutyChecks'=>$userDutyChecks,'laravelEchoPrefix'=>$laravelEchoPrefix,'permittingWorkgroups'=>$permittingWorkgroups]);
@@ -237,7 +237,7 @@ class PersonnelController extends Controller
     }
     //打卡审核类型
     public function updateDutyCheckType(Request $request){
-        if(!Gate::allows('人事管理-打卡审核类型')){return ['success'=>'false','fail_info'=>'没有权限'];}
+        if(!Gate::allows('人事管理-审核类型')){return ['success'=>'false','fail_info'=>'没有权限'];}
         $userDutyCheckId=$request->input('id');
         $userDutyCheckType=$request->input('type');
         if (is_null($userDutyCheckId) or is_null($userDutyCheckType)){

database/migrations/2020_05_14_091440_add_personnel_authority.php

@@ -14,7 +14,7 @@ class AddPersonnelAuthority extends Migration
 
     protected $authNames=[
         '人事管理',
-        '人事管理-打卡审核',
+        '人事管理-门卫审核',
         '人事管理-任务审核',
         '人事管理-录入补卡',
         '人事管理-打卡',

database/migrations/2020_06_28_162934_add_authorrities_personal_duty_check_type.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Schema;
 class AddAuthorritiesPersonalDutyCheckType extends Migration
 {
     protected $authNames=[
-       '人事管理-打卡审核类型',
+       '人事管理-审核类型',
     ];
 
     /**

database/migrations/2020_06_30_111337_change_auth_hr_verifies.php

@@ -0,0 +1,57 @@
+<?php
+
+use App\Authority;
+use App\Unit;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeAuthHrVerifies extends Migration
+{
+    protected $addNames=[
+        '人事管理-组长审核',
+    ];
+    protected $changeNames=[
+        ['人事管理-审核','人事管理-门卫审核'],
+    ];
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Authority::where('name','人事管理-门卫审核')->first();
+        foreach ($this->addNames as $namePack){
+            if(!Authority::where('name',$namePack)->first())(new Authority(['name'=>$namePack]))->save();
+        }
+        //修改或没有则添加
+        foreach ($this->changeNames as $namePack){
+            $authority=Authority::where('name',$namePack[0])->orWhere('name',$namePack[1])->first();
+            if(!$authority){
+                (new Authority(['name'=>$namePack[1],'alias_name'=>$namePack[1]]))->save();
+            }elseif($authority['name']==$namePack[0]){
+                $authority['name']=$namePack[1];
+                $authority->save();
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        foreach ($this->addNames as $name){
+            Authority::where('name',$name)->delete();
+        }
+        //改回旧的
+        foreach ($this->changeNames as $namePack){
+            $authority=Authority::where('name',$namePack[1])->first();
+            $authority['name']=$namePack[0];
+            $authority->save();
+        }
+    }
+}

resources/views/personnel/checking-in/clockAudit.blade.php

@@ -19,7 +19,7 @@
                         <tr>
                             <td>序号</td>
                             <td>姓名</td>
-                            @can('人事管理-打卡审核')<td>门卫审核</td>@endcan
+                            @can('人事管理-门卫审核')<td>门卫审核</td>@endcan
                             <td>组长审核</td>
                             <td >打卡时间</td>
                             <td>打卡类型</td>
@@ -34,7 +34,7 @@
                         <tr v-for="(userDutyCheck,i) in userDutyChecks" v-if="whichDay(userDutyCheck.checked_at)==day">
                             <td>@{{ i+1 }}</td>
                             <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.full_name }}</span></td>
-                            @can('人事管理-打卡审核')<td>
+                            @can('人事管理-门卫审核')<td>
                                 <span v-if="userDutyCheck.type=='登入'">
                                 <b v-if="userDutyCheck.verify_user_id" class="text-success">已审核</b>
                                 <button v-else @click="storeClockAudit(userDutyCheck.id,userDutyCheck.type)" class="btn btn-primary w-80">审核</button>
@@ -43,12 +43,14 @@
                             <td>
                                 <span v-if="userDutyCheck.type=='登入'">
                                 <b v-if="userDutyCheck.group_user_id" class="text-success">已审核</b>
-                                <button v-else @click="storeGroupAudit(userDutyCheck.id,userDutyCheck.type)" class="btn btn-primary w-80">组长审核</button>
+                                    @can('人事管理-组长审核')
+                                        <button v-else @click="storeGroupAudit(userDutyCheck.id,userDutyCheck.type)" class="btn btn-primary w-80">组长审核</button>
+                                    @endcan
                                 </span>
                             </td>
                             <td>@{{ userDutyCheck.checked_at.substring(11,16) }}</td>
                             <td>
-                                @can('人事管理-打卡审核类型')
+                                @can('人事管理-审核类型')
                                     <button v-if="!userDutyCheck.isChangingType" class="btn btn-sm btn-outline-secondary text-center" @click="dutyCheckType($event,userDutyCheck)" :data_id="userDutyCheck.id">@{{ userDutyCheck.type }}</button>
                                     <select v-else v-model="userDutyCheck.type" :data_id="userDutyCheck.id"
                                             @change="isException(userDutyCheck.id,userDutyCheck.user_id,userDutyCheck.checked_at,userDutyCheck.type)" class="form-control" style="width: 100px">
@@ -57,7 +59,7 @@
                                     </select>
                                 @else
                                     <span class="text-center">@{{ userDutyCheck.type }}</span>
-                                    @endcan
+                                @endcan
                             </td>
                             <td  class="text-muted"><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.mobile_phone }}</span></td>
                             <td ><span v-if="userDutyCheck.user_labor">@{{ userDutyCheck.user_labor.labor_company.name }}</span></td>