|
|
@@ -145,8 +145,7 @@ class WorkOrderFilters
|
|
|
} else {
|
|
|
array_push($status, 5);
|
|
|
}
|
|
|
-
|
|
|
- $this->queryBuilder->whereIn('status', $status);
|
|
|
+ $this->queryBuilder->whereIn('status', array_unique($status));
|
|
|
}
|
|
|
|
|
|
private function afterFilterOwner($owner_ids)
|
|
|
@@ -379,7 +378,8 @@ class WorkOrderFilters
|
|
|
|
|
|
public function process_progress($process_progress)
|
|
|
{
|
|
|
- $this->searchWay($this->queryBuilder, $process_progress, 'work_orders.process_progress');
|
|
|
+ $this->queryBuilder->where('work_orders.process_progress',$process_progress);
|
|
|
+// $this->searchWay($this->queryBuilder, $process_progress, 'work_orders.process_progress');
|
|
|
}
|
|
|
|
|
|
public function order_issue_log($log_content)
|