Accept Merge Request #210: (feature/hant -> develop)
Merge Request: 派单 Created By: @todayswind Accepted By: @todayswind URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/210?initial=true
This commit is contained in:
commit
6a6dec7ade
|
|
@ -345,7 +345,7 @@ class Worker extends Backend
|
|||
}
|
||||
if ($item_id) {
|
||||
$ids = $this->getParentIdsFromArray($item_id,$this->items);
|
||||
|
||||
$ids [] = $item_id;
|
||||
$worker_ids = WorkerItem::whereIn('item_id',$ids)->column('worker_id');
|
||||
$build->whereIn('id',$worker_ids);
|
||||
}
|
||||
|
|
@ -400,7 +400,7 @@ ORDER BY distance;",[$order->lng,$order->lat]);
|
|||
|
||||
|
||||
$ids = $this->getParentIdsFromArray($order->item_id,$this->items);
|
||||
|
||||
$ids [] = $order->item_id;
|
||||
$worker_items_ids = (new WorkerItem())
|
||||
->whereIn('item_id', $ids)
|
||||
->whereIn('worker_id', $worker_ids)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user