gx

@@ -30,7 +30,8 @@ class ProjectUserController extends BaseController
      */
      */
     public function lists(){
     public function lists(){
         $userModel = new UserModel();
         $userModel = new UserModel();
-        $query = $userModel->leftJoin('gl_project', 'gl_project_user.project_id', '=', 'gl_project.id');
+        $query = $userModel->leftJoin('gl_project', 'gl_project_user.project_id', '=', 'gl_project.id')
+                            ->leftJoin('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id');
         $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('列表',Code::SUCCESS,$lists);
         $this->response('列表',Code::SUCCESS,$lists);
@@ -52,6 +53,7 @@ class ProjectUserController extends BaseController
             'gl_project_user.email AS email',
             'gl_project_user.email AS email',
             'gl_project_user.status AS status',
             'gl_project_user.status AS status',
             'gl_project_user.name AS name',
             'gl_project_user.name AS name',
+            'gl_project_role.name AS role_name',
         ];
         ];
         return $select;
         return $select;
     }
     }