gx

@@ -215,7 +215,7 @@ class TaskController extends BaseController
      */
      */
     public function getUserTaskList(){
     public function getUserTaskList(){
         $taskOwnerModel = new TaskOwner();
         $taskOwnerModel = new TaskOwner();
-        $this->map['manage_id'] = $this->manage['id'];
+
         $taskModel = new Task();
         $taskModel = new Task();
         $map = $this->searchUserParam($taskOwnerModel,$taskModel);
         $map = $this->searchUserParam($taskOwnerModel,$taskModel);
         $lists = $taskOwnerModel->lists($map,$this->page,$this->row,$this->order);
         $lists = $taskOwnerModel->lists($map,$this->page,$this->row,$this->order);
@@ -246,11 +246,11 @@ class TaskController extends BaseController
                 $projectModel = new Project();
                 $projectModel = new Project();
                 if($this->map['search_type'] == 'project'){
                 if($this->map['search_type'] == 'project'){
                     $ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray();
                     $ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray();
-                    $manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids]])->pluck('manage_id')->toArray();
+                    $manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids],'manage_id'=>$this->manage['id']])->pluck('manage_id')->toArray();
                     $map['manage_id'] = ['in',$manage_ids];
                     $map['manage_id'] = ['in',$manage_ids];
                 }else{
                 }else{
                     $ids = $taskModel->where('content', 'like','%'.$this->map['search'].'%')->pluck('id')->toArray();
                     $ids = $taskModel->where('content', 'like','%'.$this->map['search'].'%')->pluck('id')->toArray();
-                    $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
+                    $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids],'manage_id'=>$this->manage['id']])->pluck('manage_id')->toArray();
                     $map['manage_id'] = ['in',$manage_ids];
                     $map['manage_id'] = ['in',$manage_ids];
                 }
                 }
             }
             }