人事--添加管理全部组权限

app/LaborReport.php

@@ -69,11 +69,11 @@ class LaborReport extends Model
     }
     public function getHasGroupVerifyRightAttribute(){
         if (!Gate::allows('人事管理-临时工报表')){return null; }
+        if (Gate::allows('人事管理-临时工报表-管理全部组')){return true;}
         $user=Auth::user();
         $userWorkgroupIds=$user->getPermittingWorkgroupIds($allowAll=false);
-        if (count($userWorkgroupIds)!=0){
-            return in_array($this['user_workgroup_id'],$userWorkgroupIds);
-        }
+        if (count($userWorkgroupIds)!=0) return in_array($this['user_workgroup_id'],$userWorkgroupIds);
+
     }
     public function setRemarkAttribute($remark,$id){
         return Sign::updateOrCreate(['signable_type'=>'labor_reports','signable_id'=>$id,'field'=>'remark'],['mark'=>$remark]);

database/migrations/2020_10_19_113042_create_logistic_timings_table.php

@@ -49,7 +49,13 @@ class CreateLogisticTimingsTable extends Migration
             $cityName = $item[1];
             $days_at_working = $item[2];
             $province =  Province::query()->firstOrCreate(['name'=>$provinceName]);
-            $city = City::query()->firstOrCreate(['province_id'=>$province->id,'name'=>$cityName] );
+            $city = City::query()->where('name',$cityName)->first();
+            if($city){
+                $city->province_id = $province->id;
+                $city->save();
+            }else{
+                $city = City::query()->firstOrCreate(['province_id'=>$province->id,'name'=>$cityName] );
+            }
             $logisticTiming = LogisticTiming::query()->where('to_province_id',$province->id)->where('to_city_id',$city->id)->count();
             if($logisticTiming>0){continue;}
             $create_array[] = [

database/migrations/2020_10_26_111521_add_labor_report_authorities.php

@@ -0,0 +1,29 @@
+<?php
+
+use App\Authority;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLaborReportAuthorities extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        (new Authority(['name'=>'人事管理-临时工报表-管理全部组','alias_name'=>'人事管理-临时工报表-管理全部组']))->save();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Authority::where('name','人事管理-临时工报表-管理全部组')->delete();
+    }
+}