正在显示
1 个修改的文件
包含
3 行增加
和
1 行删除
| @@ -30,7 +30,7 @@ class RenewProjectController extends BaseController | @@ -30,7 +30,7 @@ class RenewProjectController extends BaseController | ||
| 30 | * @time :2023/8/11 10:22 | 30 | * @time :2023/8/11 10:22 |
| 31 | */ | 31 | */ |
| 32 | public function lists(Project $project){ | 32 | public function lists(Project $project){ |
| 33 | - $map = $this->searchParam($this->param); | 33 | + $map = $this->searchParam($this->map); |
| 34 | $filed = ['id', 'title', 'type' ,'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at','delete_status']; | 34 | $filed = ['id', 'title', 'type' ,'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at','delete_status']; |
| 35 | $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build') | 35 | $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build') |
| 36 | ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page); | 36 | ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page); |
| @@ -64,6 +64,8 @@ class RenewProjectController extends BaseController | @@ -64,6 +64,8 @@ class RenewProjectController extends BaseController | ||
| 64 | $map['delete_status'] = 0; | 64 | $map['delete_status'] = 0; |
| 65 | if(empty($map['type'])){ | 65 | if(empty($map['type'])){ |
| 66 | $map['type'] = ['in',[2,3,4]]; | 66 | $map['type'] = ['in',[2,3,4]]; |
| 67 | + }else{ | ||
| 68 | + $map['type'] = $param['type']; | ||
| 67 | } | 69 | } |
| 68 | $map['remain_day'] = ['<=',15]; | 70 | $map['remain_day'] = ['<=',15]; |
| 69 | return $map; | 71 | return $map; |
-
请 注册 或 登录 后发表评论