作者 lyh

变更数据

@@ -220,13 +220,8 @@ class AsideTicketController extends BaseController @@ -220,13 +220,8 @@ class AsideTicketController extends BaseController
220 // 查找项目名称或公司名称 220 // 查找项目名称或公司名称
221 $ticketUploadModel = new TicketUploadData(); 221 $ticketUploadModel = new TicketUploadData();
222 $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray(); 222 $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray();
223 - if(!empty($projectIds)){  
224 - return $query->whereIn('post_id', $projectIds);  
225 - }  
226 $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray(); 223 $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
227 - if(!empty($projectIds)){  
228 - return $query->orWhereIn('table_id', $projectV6Ids);  
229 - } 224 + return $query->whereIn('post_id', $projectIds)->orWhereIn('table_id', $projectV6Ids);
230 }) 225 })
231 ->when(!empty($validated['search']), function ($query) use ($validated) { 226 ->when(!empty($validated['search']), function ($query) use ($validated) {
232 // 查找项目名称或公司名称 227 // 查找项目名称或公司名称