正在显示
1 个修改的文件
包含
11 行增加
和
2 行删除
| @@ -571,7 +571,8 @@ class ProjectController extends BaseController | @@ -571,7 +571,8 @@ class ProjectController extends BaseController | ||
| 571 | * @date 2023/9/11 | 571 | * @date 2023/9/11 |
| 572 | */ | 572 | */ |
| 573 | public function getProjectByChannel(){ | 573 | public function getProjectByChannel(){ |
| 574 | - $id = $this->param['id'] ?? []; | 574 | + $id = $this->param['id'] ?? ''; |
| 575 | + $notice_order_id = $this->param['notice_order_id'] ?? ''; | ||
| 575 | $source_id = $this->param['channel_id'] ?? 0; //原系统渠道id | 576 | $source_id = $this->param['channel_id'] ?? 0; //原系统渠道id |
| 576 | $size = $this->param['page_size'] ?? 20; | 577 | $size = $this->param['page_size'] ?? 20; |
| 577 | $type = $this->param['type'] ?? ''; | 578 | $type = $this->param['type'] ?? ''; |
| @@ -595,10 +596,15 @@ class ProjectController extends BaseController | @@ -595,10 +596,15 @@ class ProjectController extends BaseController | ||
| 595 | $id = explode(',', $id); | 596 | $id = explode(',', $id); |
| 596 | } | 597 | } |
| 597 | } | 598 | } |
| 599 | + if ($notice_order_id){ | ||
| 600 | + if(!is_array($notice_order_id)){ | ||
| 601 | + $notice_order_id = explode(',', $notice_order_id); | ||
| 602 | + } | ||
| 603 | + } | ||
| 598 | 604 | ||
| 599 | $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check']) | 605 | $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check']) |
| 600 | ->where('delete_status', 0) | 606 | ->where('delete_status', 0) |
| 601 | - ->where(function ($query) use ($channel_id, $type, $company, $id){ | 607 | + ->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id){ |
| 602 | if ($channel_id) { | 608 | if ($channel_id) { |
| 603 | $query->where('channel->channel_id', $channel_id); | 609 | $query->where('channel->channel_id', $channel_id); |
| 604 | } | 610 | } |
| @@ -611,6 +617,9 @@ class ProjectController extends BaseController | @@ -611,6 +617,9 @@ class ProjectController extends BaseController | ||
| 611 | if ($id) { | 617 | if ($id) { |
| 612 | $query->whereIn('id', $id); | 618 | $query->whereIn('id', $id); |
| 613 | } | 619 | } |
| 620 | + if ($notice_order_id) { | ||
| 621 | + $query->whereIn('notice_order_id', $notice_order_id); | ||
| 622 | + } | ||
| 614 | })->orderBy('id', 'desc')->paginate($size)->toArray(); | 623 | })->orderBy('id', 'desc')->paginate($size)->toArray(); |
| 615 | $list = []; | 624 | $list = []; |
| 616 | foreach ($data['list'] as $item){ | 625 | foreach ($data['list'] as $item){ |
-
请 注册 或 登录 后发表评论