gx

@@ -70,11 +70,16 @@ class ComController extends BaseController
      */
      */
     public function get_menu(){
     public function get_menu(){
         //根据当前登录用户角色返回用户菜单列表
         //根据当前登录用户角色返回用户菜单列表
-        $projectRoleModel = new ProjectRoleModel();
-        $info = $projectRoleModel->read(['id'=>$this->user['role_id']]);
+
         $projectMenuModel = new ProjectMenuModel();
         $projectMenuModel = new ProjectMenuModel();
-        $info['role_menu'] = trim($info['role_menu'],',');
-        $lists = $projectMenuModel->where(['status'=>0,'is_role'=>0])->whereIn('id',explode(',',$info['role_menu']))->get();
+        if($this->user['role_id'] != 0){
+            $projectRoleModel = new ProjectRoleModel();
+            $info = $projectRoleModel->read(['id'=>$this->user['role_id']]);
+            $info['role_menu'] = trim($info['role_menu'],',');
+            $lists = $projectMenuModel->where(['status'=>0,'is_role'=>0])->whereIn('id',explode(',',$info['role_menu']))->get();
+        }else{
+            $lists = $projectMenuModel->where(['status'=>0,'is_role'=>0])->get();
+        }
         $lists = $lists->toArray();
         $lists = $lists->toArray();
         $menu = array();
         $menu = array();
         foreach ($lists as $k => $v){
         foreach ($lists as $k => $v){

@@ -20,7 +20,7 @@ class DeptUserController extends BaseController
             ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
             ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
             ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
             ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
             ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
             ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
-            ->orderBy('gl_project_dept_user.id','desc');
+            ->orderBy('gl_project_user.id','desc');
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page);
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);

@@ -27,11 +27,14 @@ class LoginAuthMiddleware
         if(empty($info) || empty($token)){
         if(empty($info) || empty($token)){
             return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'当前用户未登录']);
             return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'当前用户未登录']);
         }
         }
-        $role_info = $this->setRole($info);
-        //获取当前操作的路由name
-        $action = Route::currentRouteName();
-        //查询当前用户是否拥有权限操作
-        $this->viewOperateAuth($role_info,$action);
+        //0代表超级管理员
+        if($info['role_id'] != 0){
+            $role_info = $this->setRole($info);
+            //获取当前操作的路由name
+            $action = Route::currentRouteName();
+            //查询当前用户是否拥有权限操作
+            $this->viewOperateAuth($role_info,$action);
+        }
         //配置数据库
         //配置数据库
         $this->setProject($info);
         $this->setProject($info);
         return $next($request);
         return $next($request);