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