修改

app/Service/ItemService.php

@@ -2744,7 +2744,8 @@ class ItemService extends Service
         $customer = $msg;
 
         //任务进展信息
-        $customer['mission_progress'] = $this->itemMissionProgressBoard($data, $user);
+        list($status, $msg) = $this->itemMissionProgressBoard($data, $user);
+        $customer['mission_progress'] = $msg;
 
         //文件归档
         $customer['file_list'] = $this->getMissionProgressFile($data, $user, $customer);
@@ -2775,7 +2776,7 @@ class ItemService extends Service
             $list[$key]['data_name'] = $emp[$value['data_id']] ?? '';
         }
 
-        return $list;
+        return [true, $list];
     }
 
     public function getMissionProgressFile($data, $user, $item){
@@ -3432,7 +3433,8 @@ class ItemService extends Service
         $customer['item_node_mission'] = ItemNodeMission::where('id', $customer['item_node_mission_id'])->first();
 
         //任务进展信息 该链接下所有
-        $customer['mission_progress'] = $this->itemMissionProgressBoard(['id' => $customer['item_node_mission_id'], 'item_node_mission_share_id' => $customer['id']]);
+        list($status, $msg) = $this->itemMissionProgressBoard(['id' => $customer['item_node_mission_id'], 'item_node_mission_share_id' => $customer['id']]);
+        $customer['mission_progress'] = $msg;
 
         return [true, $customer];
     }

app/Service/LoginService.php

@@ -32,7 +32,7 @@ class LoginService extends Service
         if($employee['is_admin'] == Employee::IS_ADMIN_ZERO || $employee['is_admin'] == Employee::IS_ADMIN_THREE) return [false, '账号限制登录'];
 
         //生成token
-        list($status, $jwtToken) = TokenService::getToken($employee, 3600);
+        list($status, $jwtToken) = TokenService::getToken($employee);
         if(! $status) return [false, $jwtToken];
 
         //获取人员所有的所有的顶级菜单
@@ -92,7 +92,7 @@ class LoginService extends Service
         if(! $status) return [false, $msg];
 
         //生成token
-        list($status, $jwtToken) = TokenService::getToken($employee);
+        list($status, $jwtToken) = TokenService::getToken($employee, 3600);
         if(! $status) return [false, $jwtToken];
 
         return [true, [

routes/api.php

@@ -41,14 +41,13 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     //导出统一方法
     $route->any('exportFile', 'Api\ExportFileController@exportFile');
 
-    //只有超级管理员有权限的接口 ------- 菜单管理前端页面不开放
-    $route->any('menuAdd', 'Api\SysMenuController@add')->name('only.add');
-    $route->any('menuEdit', 'Api\SysMenuController@edit')->name('only.edit');
-    $route->any('menuDel', 'Api\SysMenuController@del')->name('only.delete');
-    $route->any('menuMove', 'Api\SysMenuController@menuMove')->name('only.move');
+    $route->any('menuAdd', 'Api\SysMenuController@add');
+    $route->any('menuEdit', 'Api\SysMenuController@edit');
+    $route->any('menuDel', 'Api\SysMenuController@del');
+    $route->any('menuMove', 'Api\SysMenuController@menuMove');
 
-    $route->any('employeeManageAdd', 'Api\EmployeeController@employeeManageAdd')->name('only.manageAdd');
-    $route->any('employeeManageEdit', 'Api\EmployeeController@employeeManageEdit')->name('only.admin');
+    $route->any('employeeManageAdd', 'Api\EmployeeController@employeeManageAdd');
+    $route->any('employeeManageEdit', 'Api\EmployeeController@employeeManageEdit');
 
     //用户表头自定义设置相关
     $route->any('customFieldList', 'Api\CustomFieldSettingController@list');
@@ -60,10 +59,10 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     //人员
     $route->any('employeeAdd', 'Api\EmployeeController@employeeAdd')->middleware('OssFileDeal');
     $route->any('employeeEdit', 'Api\EmployeeController@employeeEdit')->middleware('OssFileDeal');
-    $route->any('employeeEditOther', 'Api\EmployeeController@employeeEditOther')->name('employee.editPassword');
+    $route->any('employeeEditOther', 'Api\EmployeeController@employeeEditOther');
     $route->any('employeeDel', 'Api\EmployeeController@employeeDel')->middleware('OssFileDeal');
-    $route->any('employeeDetail', 'Api\EmployeeController@employeeDetail')->name('employee.detail');
-    $route->any('employeeList', 'Api\EmployeeController@employeeList')->name('employee.list');
+    $route->any('employeeDetail', 'Api\EmployeeController@employeeDetail');
+    $route->any('employeeList', 'Api\EmployeeController@employeeList');
 
     $route->any('employeeDepart', 'Api\EmployeeController@employeeDepart');
     $route->any('employeeEditImg', 'Api\EmployeeController@employeeEditImg')->middleware('OssFileDeal');
@@ -77,18 +76,18 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('companyWorkArrangeDetail', 'Api\EmployeeController@companyWorkArrangeDetail');
 
     //部门
-    $route->any('departAdd', 'Api\EmployeeController@departAdd')->name('depart.add');
-    $route->any('departEdit', 'Api\EmployeeController@departEdit')->name('depart.edit');
-    $route->any('departDel', 'Api\EmployeeController@departDel')->name('employee.del');
+    $route->any('departAdd', 'Api\EmployeeController@departAdd');
+    $route->any('departEdit', 'Api\EmployeeController@departEdit');
+    $route->any('departDel', 'Api\EmployeeController@departDel');
     $route->any('departList', 'Api\EmployeeController@departList');
 
     //角色
-    $route->any('roleAdd', 'Api\EmployeeController@roleAdd')->name('role.add');
-    $route->any('roleEdit', 'Api\EmployeeController@roleEdit')->name('role.edit');
-    $route->any('roleDel', 'Api\EmployeeController@roleDel')->name('role.delete');
+    $route->any('roleAdd', 'Api\EmployeeController@roleAdd');
+    $route->any('roleEdit', 'Api\EmployeeController@roleEdit');
+    $route->any('roleDel', 'Api\EmployeeController@roleDel');
     $route->any('roleList', 'Api\EmployeeController@roleList');
-    $route->any('roleDetail', 'Api\EmployeeController@roleDetail')->name('role.');
-    $route->any('roleMenu', 'Api\EmployeeController@roleMenu')->name('role.');
+    $route->any('roleDetail', 'Api\EmployeeController@roleDetail');
+    $route->any('roleMenu', 'Api\EmployeeController@roleMenu');
 
     //设备
     $route->any('deviceList', 'Api\DeviceController@deviceList');
@@ -199,15 +198,15 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
 
     //人员月度工资单
     $route->any('monthlyPsOrderList', 'Api\PersonSalaryController@monthlyPsOrderList');
-    $route->any('monthlyPsOrderEdit', 'Api\PersonSalaryController@monthlyPsOrderEdit');
-    $route->any('monthlyPsOrderAdd', 'Api\PersonSalaryController@monthlyPsOrderAdd');
+    $route->any('monthlyPsOrderEdit', 'Api\PersonSalaryController@monthlyPsOrderEdit')->name('use_range_check');
+    $route->any('monthlyPsOrderAdd', 'Api\PersonSalaryController@monthlyPsOrderAdd')->name('use_range_check');
     $route->any('monthlyPsOrderDel', 'Api\PersonSalaryController@monthlyPsOrderDel');
     $route->any('monthlyPsOrderDetail', 'Api\PersonSalaryController@monthlyPsOrderDetail');
 
     //设备月度折旧单
     $route->any('monthlyDdOrderList', 'Api\DeviceDepreciationController@monthlyDdOrderList');
-    $route->any('monthlyDdOrderEdit', 'Api\DeviceDepreciationController@monthlyDdOrderEdit');
-    $route->any('monthlyDdOrderAdd', 'Api\DeviceDepreciationController@monthlyDdOrderAdd');
+    $route->any('monthlyDdOrderEdit', 'Api\DeviceDepreciationController@monthlyDdOrderEdit')->name('use_range_check');
+    $route->any('monthlyDdOrderAdd', 'Api\DeviceDepreciationController@monthlyDdOrderAdd')->name('use_range_check');
     $route->any('monthlyDdOrderDel', 'Api\DeviceDepreciationController@monthlyDdOrderDel');
     $route->any('monthlyDdOrderDetail', 'Api\DeviceDepreciationController@monthlyDdOrderDetail');
 
@@ -221,8 +220,8 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
 
     //人员日工时单
     $route->any('dailyPwOrderList', 'Api\PersonWorkController@dailyPwOrderList');
-    $route->any('dailyPwOrderEdit', 'Api\PersonWorkController@dailyPwOrderEdit');
-    $route->any('dailyPwOrderAdd', 'Api\PersonWorkController@dailyPwOrderAdd');
+    $route->any('dailyPwOrderEdit', 'Api\PersonWorkController@dailyPwOrderEdit')->name('use_range_check');
+    $route->any('dailyPwOrderAdd', 'Api\PersonWorkController@dailyPwOrderAdd')->name('use_range_check');
     $route->any('dailyPwOrderDel', 'Api\PersonWorkController@dailyPwOrderDel');
     $route->any('dailyPwOrderDetail', 'Api\PersonWorkController@dailyPwOrderDetail');
     //根据月工时生成
@@ -232,8 +231,8 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
 
     //设备日工时单
     $route->any('dailyDwOrderList', 'Api\DeviceWorkController@dailyDwOrderList');
-    $route->any('dailyDwOrderEdit', 'Api\DeviceWorkController@dailyDwOrderEdit');
-    $route->any('dailyDwOrderAdd', 'Api\DeviceWorkController@dailyDwOrderAdd');
+    $route->any('dailyDwOrderEdit', 'Api\DeviceWorkController@dailyDwOrderEdit')->name('use_range_check');
+    $route->any('dailyDwOrderAdd', 'Api\DeviceWorkController@dailyDwOrderAdd')->name('use_range_check');
     $route->any('dailyDwOrderDel', 'Api\DeviceWorkController@dailyDwOrderDel');
     $route->any('dailyDwOrderDetail', 'Api\DeviceWorkController@dailyDwOrderDetail');
     //根据月工时生成
@@ -243,8 +242,8 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
 
     //日历设置
     $route->any('calendarList', 'Api\CalendarController@calendarList');
-    $route->any('calendarEdit', 'Api\CalendarController@calendarEdit');
-    $route->any('calendarAdd', 'Api\CalendarController@calendarAdd');
+    $route->any('calendarEdit', 'Api\CalendarController@calendarEdit')->name('use_range_check');
+    $route->any('calendarAdd', 'Api\CalendarController@calendarAdd')->name('use_range_check');
     $route->any('calendarDel', 'Api\CalendarController@calendarDel');
     $route->any('calendarDetail', 'Api\CalendarController@calendarDetail');
 
@@ -265,8 +264,8 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
 
     //费用报销单
     $route->any('expenseClaimsList', 'Api\ExpenseClaimsController@expenseClaimsList');
-    $route->any('expenseClaimsAdd', 'Api\ExpenseClaimsController@expenseClaimsAdd')->middleware('OssFileDeal');
-    $route->any('expenseClaimsEdit', 'Api\ExpenseClaimsController@expenseClaimsEdit')->middleware('OssFileDeal');
+    $route->any('expenseClaimsAdd', 'Api\ExpenseClaimsController@expenseClaimsAdd')->middleware('OssFileDeal')->name('use_range_check');;
+    $route->any('expenseClaimsEdit', 'Api\ExpenseClaimsController@expenseClaimsEdit')->middleware('OssFileDeal')->name('use_range_check');;
     $route->any('expenseClaimsDel', 'Api\ExpenseClaimsController@expenseClaimsDel')->middleware('OssFileDeal');
     $route->any('expenseClaimsDetail', 'Api\ExpenseClaimsController@expenseClaimsDetail');