gx

@@ -216,9 +216,10 @@ class TaskController extends BaseController
     public function getUserTaskList(){
     public function getUserTaskList(){
         $taskOwnerModel = new TaskOwner();
         $taskOwnerModel = new TaskOwner();
         $this->map['manage_id'] = $this->manage['id'];
         $this->map['manage_id'] = $this->manage['id'];
-        $lists = $taskOwnerModel->lists($this->map,$this->page,$this->row,$this->order);
+        $taskModel = new Task();
+        $map = $this->searchUserParam($taskOwnerModel,$taskModel);
+        $lists = $taskOwnerModel->lists($map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
-            $taskModel = new Task();
             $managerModel = new Manage();
             $managerModel = new Manage();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $taskInfo = $taskModel->read(['id'=>$v['task_id']]);
                 $taskInfo = $taskModel->read(['id'=>$v['task_id']]);
@@ -230,4 +231,30 @@ class TaskController extends BaseController
         }
         }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
+    /**
+     * @remark :我的任务搜索参数
+     * @name   :searchUserParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/5 15:00
+     */
+    public function searchUserParam(&$taskOwnerModel,&$taskModel){
+        $map = [];
+        if (isset($this->map['search_type']) && !empty($this->map['search_type'])){
+            if(isset($this->map['search']) && !empty($this->map['search'])) {
+                $projectModel = new Project();
+                if($this->map['search_type'] == 'project'){
+                    $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{
+                    $ids = $taskModel->where('content', 'like','%'.$this->map['search'].'%')->pluck('id')->toArray();
+                    $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
+                    $map['manage_id'] = ['in',$manage_ids];
+                }
+            }
+        }
+        return $map;
+    }
 }
 }