gx

@@ -30,7 +30,7 @@ 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')->where('gl_project_user.role_id',$this::ROLE_ID);
+        $query = $userModel->leftJoin('gl_project', 'gl_project_user.project_id', '=', 'gl_project.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);
@@ -61,6 +61,12 @@ class ProjectUserController extends BaseController
         if(isset($this->map['title'])){
         if(isset($this->map['title'])){
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
+        if(isset($this->map['name'])){
+            $query = $query->where('gl_project_user.name','like','%'.$this->map['name'].'%');
+        }
+        if(isset($this->map['mobile'])){
+            $query = $query->where('gl_project_user.mobile','like','%'.$this->map['mobile'].'%');
+        }
         return $query;
         return $query;
     }
     }