正在显示
1 个修改的文件
包含
6 行增加
和
4 行删除
| @@ -218,10 +218,12 @@ class AsideTicketController extends BaseController | @@ -218,10 +218,12 @@ 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 | - $ticketUploadModel = new TicketUploadData(); | ||
| 222 | - $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray(); | ||
| 223 | - $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray(); | ||
| 224 | - return $query->whereIn('post_id', $projectIds)->orWhereIn('table_id', $projectV6Ids); | 221 | + if($this->param['project_type'] == 1 || $this->param['project_type'] == 2){ |
| 222 | + $ticketUploadModel = new TicketUploadData(); | ||
| 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(); | ||
| 225 | + return $query->whereIn('post_id', $projectIds)->orWhereIn('table_id', $projectV6Ids); | ||
| 226 | + } | ||
| 225 | }) | 227 | }) |
| 226 | ->when(!empty($validated['search']), function ($query) use ($validated) { | 228 | ->when(!empty($validated['search']), function ($query) use ($validated) { |
| 227 | // 查找项目名称或公司名称 | 229 | // 查找项目名称或公司名称 |
-
请 注册 或 登录 后发表评论