作者 lyh

gx

@@ -38,8 +38,6 @@ class TaskController extends BaseController @@ -38,8 +38,6 @@ class TaskController extends BaseController
38 */ 38 */
39 public function list(Task $task) 39 public function list(Task $task)
40 { 40 {
41 - var_dump(11111);  
42 - die();  
43 $lists = []; 41 $lists = [];
44 //获取所有人员 42 //获取所有人员
45 $taskOwnerModel = new TaskOwner(); 43 $taskOwnerModel = new TaskOwner();
@@ -87,9 +85,12 @@ class TaskController extends BaseController @@ -87,9 +85,12 @@ class TaskController extends BaseController
87 $ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray(); 85 $ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray();
88 $manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids]])->pluck('manage_id')->toArray(); 86 $manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids]])->pluck('manage_id')->toArray();
89 $map['manage_id'] = ['in',$manage_ids]; 87 $map['manage_id'] = ['in',$manage_ids];
  88 +
90 } 89 }
91 }else{ 90 }else{
92 - $map['manage_id'] = $this->map['manage_id']; 91 + if(isset($this->map['search_type']) && !empty($this->map['search_type'])){
  92 + $map['manage_id'] = $this->map['manage_id'];
  93 + }
93 } 94 }
94 95
95 return $map; 96 return $map;