gx

@@ -53,6 +53,7 @@ class ProjectController extends BaseController
         //类型
         //类型
         if(isset($this->map['type'])){
         if(isset($this->map['type'])){
             $map['type'] = $this->searchType($this->map['type']);
             $map['type'] = $this->searchType($this->map['type']);
+            $map['extend_type'] = 0;//排除未续费项目
         }
         }
         $filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'created_at'];
         $filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'created_at'];
         $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')
         $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')

@@ -132,7 +132,7 @@ class RenewProjectController extends BaseController
      * @time   :2023/8/18 14:33
      * @time   :2023/8/18 14:33
      */
      */
     public function notHaveRenewItems(Project $project){
     public function notHaveRenewItems(Project $project){
-        $this->map['type'] = $project::TYPE_FIVE;//未续费网站
+        $this->map['extend_type'] = $project::TYPE_FIVE;//未续费网站
         $lists = $project->where($this->map)->with('payment')->with('deploy_build')
         $lists = $project->where($this->map)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')
             ->with('deploy_optimize')->with('online_check')
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);