|
|
@@ -7,6 +7,7 @@ use App\Order;
|
|
|
use App\OrderIssue;
|
|
|
use App\OrderPackage;
|
|
|
use App\Traits\ModelSearchWay;
|
|
|
+use App\User;
|
|
|
use App\WorkOrder;
|
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
|
use Illuminate\Http\Request;
|
|
|
@@ -129,12 +130,10 @@ class WorkOrderFilters
|
|
|
$this->queryBuilder->where('work_orders.review_at','<=',$review_at_end);
|
|
|
}
|
|
|
// 创建人
|
|
|
- public function creator($id)
|
|
|
+ public function creator($creator)
|
|
|
{
|
|
|
- if (is_array($id))
|
|
|
- $this->queryBuilder->whereIn('work_orders.creator_id',$id);
|
|
|
- else
|
|
|
- $this->queryBuilder->where('work_orders.creator_id',$id);
|
|
|
+ $userQuery = User::query()->select('id')->where('name','like',"%{$creator}%");;
|
|
|
+ $this->queryBuilder->whereIn('creator_id',$userQuery);
|
|
|
}
|
|
|
// 审核人
|
|
|
public function reviewer($id)
|