|
|
@@ -93,6 +93,7 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
|
|
|
{
|
|
|
$fields = ['mw.*','mwr.maintain_exp_type','mwr.other_exp_type'];
|
|
|
$orders = ['mw.id' => 'desc'];
|
|
|
+ $queryWhere = $this->queryWhere();
|
|
|
// 派单搜索条件 - 订单坐标距离排序
|
|
|
if($this->lat && $this->lon){
|
|
|
$fields[] = Db::raw('ROUND(6371 * ACOS(COS(RADIANS('.$this->lat.')) * COS(RADIANS(mw.lat)) * COS(RADIANS(mw.lon) - RADIANS('.$this->lon.')) + SIN(RADIANS('.$this->lat.')) * SIN(RADIANS(mw.lat))), 2) AS user_distance');
|
|
|
@@ -101,7 +102,7 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
|
|
|
return MasterWorker::alias('mw')
|
|
|
->join('master_worker_register mwr', 'mwr.worker_id = mw.id')
|
|
|
->where($this->searchWhere)
|
|
|
- ->where($this->queryWhere())
|
|
|
+ ->where($queryWhere)
|
|
|
->field($fields)
|
|
|
->limit($this->limitOffset, $this->limitLength)
|
|
|
->order($orders)
|