gx

@@ -36,11 +36,8 @@ class RenewProjectController extends BaseController
      */
      */
     public function lists(Project $project){
     public function lists(Project $project){
         $arr = $this->getLessThanFifteenProjectId();
         $arr = $this->getLessThanFifteenProjectId();
-        $map = [];
-        $this->searchParam($map,$this->map,$arr);
-        //按类型搜索
-        $map['id'] = ['in', $arr];
-        $filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at'];
+        $map = $this->searchParam($this->map,$arr);
+        $filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at','delete_status'];
         $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')
         $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){
@@ -82,7 +79,8 @@ class RenewProjectController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/8/30 10:30
      * @time   :2023/8/30 10:30
      */
      */
-    public function searchParam(&$map,$param,&$arr){
+    public function searchParam($param,&$arr){
+        $map = [];
         //按类型搜索
         //按类型搜索
         if(!empty($param['search']) && !empty($param['search_type'])){
         if(!empty($param['search']) && !empty($param['search_type'])){
             if($this->param['search_type'] == 'domain'){
             if($this->param['search_type'] == 'domain'){
@@ -92,6 +90,9 @@ class RenewProjectController extends BaseController
                 $map[$this->param['search_type']] = ['like', "%{$this->param['search']}%"];
                 $map[$this->param['search_type']] = ['like', "%{$this->param['search']}%"];
             }
             }
         }
         }
+        //按类型搜索
+        $map['id'] = ['in', $arr];
+        $map['delete_status'] = 0;
         return $map;
         return $map;
     }
     }