gx

@@ -91,6 +91,7 @@ class ProjectController extends BaseController
      * @time   :2023/8/30 10:14
      * @time   :2023/8/30 10:14
      */
      */
     public function searchType(&$query){
     public function searchType(&$query){
+        $query->where('gl_project.delete_status',Project::TYPE_ZERO);
         if(!isset($this->map['type'])){
         if(!isset($this->map['type'])){
             $this->map['type'] = Project::TYPE_ZERO;
             $this->map['type'] = Project::TYPE_ZERO;
         }
         }

@@ -253,6 +253,8 @@ class TaskController extends BaseController
                     $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids],'manage_id'=>$this->manage['id']])->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];
                 }
                 }
+            }else{
+                $map['manage_id'] = $this->manage['id'];
             }
             }
         }else{
         }else{
             $map['manage_id'] = $this->manage['id'];
             $map['manage_id'] = $this->manage['id'];