周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 0ca6195de5aed0db2c704c23f80ccea8ff5f44fd 2 个父辈 4b4f0769 a47032e0

合并分支 'lyh-server' 到 'master' 

变更数据



查看合并请求 !3320
内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -218,7 +218,7 @@ class AsideTicketController extends BaseController @@ -218,7 +218,7 @@ class AsideTicketController extends BaseController
218 //待审核项目列表 218 //待审核项目列表
219 ->when(!empty($this->param['pending_review']), function ($query) use ($validated) { 219 ->when(!empty($this->param['pending_review']), function ($query) use ($validated) {
220 // 查找项目名称或公司名称 220 // 查找项目名称或公司名称
221 - if(!isset($this->param['project_type']) || ($this->param['project_type'] == 1 || $this->param['project_type'] == 2)){ 221 + if(isset($this->param['project_type']) && ($this->param['project_type'] == 1 || $this->param['project_type'] == 2)){
222 $ticketUploadModel = new TicketUploadData(); 222 $ticketUploadModel = new TicketUploadData();
223 $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray(); 223 $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray();
224 $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray(); 224 $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();