瀏覽代碼

更新项目经理

ChenWuJie 4 年之前
父節點
當前提交
0ae177632b
共有 2 個文件被更改,包括 8 次插入6 次删除
  1. 1 0
      app/Http/Controllers/Admin/ProjectController.php
  2. 7 6
      app/Models/ProjectUser.php

+ 1 - 0
app/Http/Controllers/Admin/ProjectController.php

xqd
@@ -76,6 +76,7 @@ class ProjectController extends BaseController
         }
         if($request->input('user_id')){
             $items->whereHas('project_user',function ($query){
+                $query->where('project_role_id','=','4');
                 $query->whereHas('user',function ($query){
                     $query->where('id','=',request('user_id'));
                 });

+ 7 - 6
app/Models/ProjectUser.php

xqd xqd
@@ -2,8 +2,10 @@
 
 namespace App\Models;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
+
 class ProjectUser extends BaseModel
 {
     public function projectRole()
@@ -40,14 +42,13 @@ class ProjectUser extends BaseModel
         return $validator;
     }
     public static function getProjectManagerUser(){
-        $user_list = self::where('id', '>', 0)->where('project_role_id','4')->get()->toArray();
-        foreach ($user_list as &$value){
+        $user_list = DB::table('project_users')->select('user_id')->where('project_role_id','=',4)->distinct()->get()->toArray();
+        $list = json_encode($user_list,true);
+        $new_user_list = json_decode($list,true);
+        foreach ($new_user_list as &$value){
             $name = User::where('id',$value['user_id'])->value('name');
             $value['name'] = $name;
-//            dd($name);
-//            dd($user_list);
         }
-//        dd($user_list);
-        return $user_list;
+        return $new_user_list;
     }
 }