diff --git a/app/Http/Controllers/ProjectAdmin/UserController.php b/app/Http/Controllers/ProjectAdmin/UserController.php
index 8395d78..937c36e 100644
--- a/app/Http/Controllers/ProjectAdmin/UserController.php
+++ b/app/Http/Controllers/ProjectAdmin/UserController.php
@@ -8,69 +8,69 @@
 use App\Model\User;
 use App\Model\ProjectMember;
 use App\Model\ProjectModule;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 
 class UserController extends Controller
 {
     //显示全部人员
-    public function getAllUsers()
-    {
-        $userInfo = User::getAllUsers();
+    public function getAllUsers(){
+        $id = Auth::id();
+        // $id = 1;
+        if($id == null) {
+            return response()->fail(100, '身份异常!');
+        }
+        $userInfo = User::getAllUsers($id);
         return $userInfo != null ?
             response()->success(200, '获取成功!', $userInfo) :
-            response()->fail(100, '获取失败!');
+            response()->fail(100, '未查询到数据!');
     }
 
     //获取要修改的人员
-    public function getUpdateUser($id)
-    {
-        $res = User::getUpdateUser($id);
+    public function getUpdateUser($id){
+        $res = User::getUpdateUsers($id);
         return $res != null ?
-            response()->success(200, '获取成功!', $res) :
-            response()->fail(100, '获取失败!');
+            response()->success(200, '修改成功!', $res) :
+            response()->fail(100, '修改失败!');
     }
 
     //修改人员
-    public function updateUser(Request $request, $id)
-    {
-        $res = User::updateUser($request, $id);
+    public function updateUser(Request $request,$id){
+        $res = User::updateUser($request,$id);
         return $res != 0 ?
             response()->success(200, '修改成功!', $res) :
             response()->fail(100, '修改失败!');
     }
 
     //移除人员
-    public function deleteUser($id)
-    {
+    public function deleteUser($id){
         $pname = Input::get('pname');
-        $res = User::deleteUser($pname, $id);
+        $res = User::deleteUser($pname,$id);
         return $res != 0 ?
             response()->success(200, '移除成功!', $res) :
-            response()->fail(100, '移除失败!');
+            response()->fail(100, '人员不存在!');
     }
 
     //获取人员（根据传入值得不同获取不同人员）
-    public function getUsers()
-    {
+    public function getUsers(){
         $data = Input::all();
-        if ($data != null) {
+        if($data != null){
             $res = User::getUsers($data);
             return $res != null ?
                 response()->success(200, '获取成功!', $res) :
                 response()->fail(100, '获取失败!');
-        } else {
+        }else{
             response()->fail(100, '参数未传');
         }
     }
 
     //搜索人员
-    public function searchUser(searchRequest $request)
-    {
+    public function searchUser(searchRequest $request){
         $data = $request->Content;
         $res = User::searchUser($data);
-        if ($res['data'] == null) {
-            return response()->success(200, '未查询到数据!', null);
-        } else {
+        if($res['data'] == null){
+            return response()->fail(100, '未查询到数据!', null);
+        }else{
             return response()->success(200, '获取成功!', $res);
         }
     }
diff --git a/app/Model/User.php b/app/Model/User.php
index 6852b57..c0ec1c1 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -119,21 +119,19 @@ public function projectMembers()
      * @return
      * @throws \Exception
      */
-    public static function getAllUsers()
-    {
-        try {
+    public static function getAllUsers($id){
+        try{
             $res = DB::table('users as t1')
-                ->join('project_members as t2', 't1.id', '=', 't2.user_id')
-                ->join('projects as t3', 't2.project_id', 't3.id')
-                ->join('positions as t4', 't1.id', 't4.user_id')
-                ->select('t1.name', 't2.type', 't4.position_code', 't1.phone_number', 't1.email', 't3.name')
-                ->paginate(env('PAGE_NUM'));
+                ->leftjoin('project_members as t2','t1.id','=','t2.user_id')
+                ->leftjoin('projects as t3','t2.project_id','t3.id')
+                ->leftjoin('positions as t4','t1.id','t4.user_id')
+                ->select('t1.name','t2.type','t4.position_code','t1.phone_number','t1.email','t3.name as project_name')
+                ->where('t3.amdin_user_id',$id)
+                ->paginate(4);
             return $res;
-        } catch (\Exception $e) {
+        }catch (\Exception $e){
             \App\Utils\Logs::logError('获取所有人员失败!', [$e->getMessage()]);
-            return null;
         }
-
     }
 
     /**
@@ -155,71 +153,75 @@ public static function getUpdateUser($id)
             return null;
         }
     }
+    public static function getUpdateUsers($id){
+        try{
+            $data = User::select('id','name','phone_number','email')
+                ->where('id',$id)
+                ->get();
+            return $data;
+        }catch (\Exception $e){
+            \App\Utils\Logs::logError('获取修改人员失败!', [$e->getMessage()]);
+        }
+    }
 
     /**
      *修改人员
      */
-    public static function updateUser($request, $id)
-    {
-        try {
+    public static function updateUser($request,$id){
+        try{
             $res = DB::table('users as t1')
-                ->leftJoin('project_members as t2', 't1.id', 't2.user_id')
-                ->leftJoin('projects as t3', 't2.project_id', 't3.id')
-                ->where('t1.id', $id)
+                ->join('project_members as t2','t1.id','t2.user_id')
+                ->join('projects as t3','t2.project_id','t3.id')
+                ->join('positions as t4','t4.user_id','t1.id')
+                ->where('t1.id',$id)
+                ->where('t3.name',$request->pname)
                 ->update([
-                    't2.type' => $request->type
+                    't4.position_code'=>$request->pcode
                 ]);
             return $res;
-        } catch (\Exception $e) {
+        }catch (\Exception $e){
             \App\Utils\Logs::logError('修改人员失败!', [$e->getMessage()]);
-            return 0;
         }
     }
 
     /**
      *移除人员
      */
-    public static function deleteUser($pname, $id)
-    {
-        try {
+    public static function deleteUser($pname,$id){
+        try{
             $res = DB::table('users as t1')
-                ->leftjoin('project_members as t2', 't1.id', 't2.user_id')
-                ->leftjoin('projects as t3', 't3.id', 't2.project_id')
+                ->leftjoin('project_members as t2','t1.id','t2.user_id')
+                ->leftjoin('projects as t3','t3.id','t2.project_id')
                 ->select('t2.id')
-                ->where('t3.name', $pname)
-                ->where('t1.id', $id)
+                ->where('t3.name',$pname)
+                ->where('t1.id',$id)
                 ->get()
                 ->toarray();
             $data = DB::table('project_members')
-                ->where('id', $res[0]->id)
-                ->update([
-                    'project_id' => 0,
-                ]);
+                ->where('id',$res[0]->id)
+                ->delete();
             return $data;
-        } catch (\Exception $e) {
+        }catch (\Exception $e){
             \App\Utils\Logs::logError('移除人员失败!', [$e->getMessage()]);
-            return 0;
         }
     }
 
     /**
      *查询人员(根据传入数据的不同查出不同的数据)
      */
-    public static function getUsers($data)
-    {
-        try {
+    public static function getUsers($data){
+        try{
             $res = DB::table('users as t1')
-                ->join('project_members as t2', 't1.id', '=', 't2.user_id')
-                ->join('projects as t3', 't2.project_id', 't3.id')
-                ->join('positions as t4', 't1.id', 't4.user_id')
-                ->select('t1.id', 't1.name', 't2.type', 't4.position_code', 't1.phone_number', 't1.email', 't3.name')
-                ->where('t2.type', $data['type'])
-                ->where('t3.name', $data['pname'])
-                ->paginate(env('PAGE_NUM'));
+                ->join('project_members as t2','t1.id','=','t2.user_id')
+                ->join('projects as t3','t2.project_id','t3.id')
+                ->join('positions as t4','t1.id','t4.user_id')
+                ->select('t1.id','t1.name','t2.type','t4.position_code','t1.phone_number','t1.email','t3.name')
+                ->where('t4.position_code',$data['pcode'])
+                ->where('t3.id',$data['pid'])
+                ->paginate(4);
             return $res;
-        } catch (\Exception $e) {
+        }catch (\Exception $e){
             \App\Utils\Logs::logError('获取人员失败!', [$e->getMessage()]);
-            return null;
         }
     }
 
diff --git a/routes/api.php b/routes/api.php
index 63f690f..e98322a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -29,17 +29,26 @@
 Route::get('logs', 'Logs\LogController@logs');//
 
 //zhengruyuan
-Route::prefix('projectadmin')->namespace('ProjectAdmin')->group(function () {
-    Route::get('getAllUsers', 'UserController@getAllUsers');//显示全部人员    {项目管理员只能看到自己的项目！这里查询的是所有}
-    Route::get('getUpdateUser/{id}', 'UserController@getUpdateUser');//获取要修改的人员 {获取但是使用的model方法是删除}
-    Route::post('updateUser/{id}', 'UserController@updateUser');//修改人员  {这里只能修改类型}
-    Route::get('deleteUser/{id}', 'UserController@deleteUser');//移除人员   {这里应该直接在项目人员表中删除就行，而不是设置项目id为0}
-    Route::get('getUsers', 'UserController@getUsers');//获取人员(根据传入参数的不同获取不同人员)   {成员类型是什么？}
-    Route::post('searchUser', 'UserController@searchUser');//搜索人员
+// Route::prefix('projectadmin')->namespace('ProjectAdmin')->group(function () {
+    //     Route::get('getAllUsers', 'UserController@getAllUsers');//显示全部人员    {项目管理员只能看到自己的项目！这里查询的是所有}
+    //     Route::get('getUpdateUser/{id}', 'UserController@getUpdateUser');//获取要修改的人员 {获取但是使用的model方法是删除}
+    //     Route::post('updateUser/{id}', 'UserController@updateUser');//修改人员  {这里只能修改类型}
+    //     Route::get('deleteUser/{id}', 'UserController@deleteUser');//移除人员   {这里应该直接在项目人员表中删除就行，而不是设置项目id为0}
+    //     Route::get('getUsers', 'UserController@getUsers');//获取人员(根据传入参数的不同获取不同人员)   {成员类型是什么？}
+    //     Route::post('searchUser', 'UserController@searchUser');//搜索人员
+    // });
+//zhengruyuan
+Route::prefix('projectadmin')->namespace('ProjectAdmin')->group(function(){
+    Route::get('getAllUsers','UserController@getAllUsers');//显示全部人员
+    Route::get('getUpdateUser/{id}','UserController@getUpdateUser');//获取要修改的人员
+    Route::post('updateUser/{id}','UserController@updateUser');//修改人员
+    Route::get('deleteUser/{id}','UserController@deleteUser');//移除人员
+    Route::get('getUsers','UserController@getUsers');//获取所有人员(不包括负责人)
+    Route::post('searchUser','UserController@searchUser');//搜索人员
 });
-
-//易康
-Route::prefix('ProjectAdmin')->namespace('ProjectAdmin')->group(function () {
+    
+    //易康
+    Route::prefix('ProjectAdmin')->namespace('ProjectAdmin')->group(function () {
     Route::get('getAllProject', 'ProjectController@getAllProject'); //项目管理员获取全部项目信息
     Route::get('getProject/{id}', 'ProjectController@getProject'); //获取指定{id}项目信息
     Route::post('setProject/{id}', 'ProjectController@setProject'); //修改项目