hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #210: (feature/hant -> develop)

Browse Source 
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:
todayswind 2025-07-02 17:54:02 +08:00 committed by Coding
commit 6a6dec7ade
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/workers/Worker.php
View File

@ -345,7 +345,7 @@ class Worker extends Backend
} }
if ($item_id) { if ($item_id) {
$ids = $this->getParentIdsFromArray($item_id,$this->items); $ids = $this->getParentIdsFromArray($item_id,$this->items);
$ids [] = $item_id;
$worker_ids = WorkerItem::whereIn('item_id',$ids)->column('worker_id'); $worker_ids = WorkerItem::whereIn('item_id',$ids)->column('worker_id');
$build->whereIn('id',$worker_ids); $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 = $this->getParentIdsFromArray($order->item_id,$this->items);
$ids [] = $order->item_id;
$worker_items_ids = (new WorkerItem()) $worker_items_ids = (new WorkerItem())
->whereIn('item_id', $ids) ->whereIn('item_id', $ids)
->whereIn('worker_id', $worker_ids) ->whereIn('worker_id', $worker_ids)