chuan 2 months ago
parent
commit
1192d0618a
  1. 2
      app/admin/route/app.php
  2. 1
      app/admin/service/AdminBaseService.php
  3. 2
      app/admin/service/AgentService.php
  4. 10
      app/admin/service/auth/AuthRuleService.php

2
app/admin/route/app.php

@ -14,7 +14,7 @@ $header = [
//Route::get('/test', 'Test/index');
Route::post('/test', 'Test/index');
Route::post('/test_upload', 'Upload/uploadVideo');
Route::post('test_api', 'Notice/popUp');
Route::post('test_api', 'auth.AuthRule/getSideMenu');
Route::group('/', function () {
// 上传图片
Route::post('/upload', 'Upload/upload');

1
app/admin/service/AdminBaseService.php

@ -538,7 +538,6 @@ class AdminBaseService
$parent = array_filter($menus, function ($item) use ($parentId) {
return $item['id'] == $parentId;
});
if ($parent) {
$parent = array_values($parent);
if ($parent[0]['name']) {

2
app/admin/service/AgentService.php

@ -207,7 +207,7 @@ class AgentService extends AdminBaseService
$resData[] = $tmp;
}
}
return $this->toData('0', 'success', [
'list' => $resData, // 当前页的数据
'page' => $list->currentPage(), // 当前页码

10
app/admin/service/auth/AuthRuleService.php

@ -148,16 +148,20 @@ class AuthRuleService extends AdminBaseService
public function getSideMenu($user_id){
try {
//获取用户权限id
$user = AdminModel::find($user_id);
$user = AdminModel::where('id', $user_id)->find();
if (empty($user)) {
return $this->toData('500', '当前用户数据为空', ['user_id'=>$user_id]);
return $this->toData('500', '当前用户数据为空');
}
// 获取账号的角色信息
$role = AuthRoleModel::where('id', $user->role_id)->find();
if (empty($role)) {
return $this->toData('500', '当前账号角色数据为空');
}
//查询拥有权限
if($user->role_id == AdminModel::ROLE_ID_ADMIN){
//超级管理员拥有全部权限
$authRule=AuthRuleModel::order('sort', 'asc')->select()->toArray();
}else{
$role=AuthRoleModel::find($user->role_id);
$authRule=AuthRuleModel::whereIn('id',$role->rules)->order('sort', 'asc')->select()->toArray();
}

Loading…
Cancel
Save