|
...
|
...
|
@@ -218,10 +218,12 @@ class AsideTicketController extends BaseController |
|
|
|
//待审核项目列表
|
|
|
|
->when(!empty($this->param['pending_review']), function ($query) use ($validated) {
|
|
|
|
// 查找项目名称或公司名称
|
|
|
|
if($this->param['project_type'] == 1 || $this->param['project_type'] == 2){
|
|
|
|
$ticketUploadModel = new TicketUploadData();
|
|
|
|
$projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray();
|
|
|
|
$projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
|
|
|
|
return $query->whereIn('post_id', $projectIds)->orWhereIn('table_id', $projectV6Ids);
|
|
|
|
}
|
|
|
|
})
|
|
|
|
->when(!empty($validated['search']), function ($query) use ($validated) {
|
|
|
|
// 查找项目名称或公司名称
|
...
|
...
|
|
