|
|
@@ -129,6 +129,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
|
|
|
])
|
|
|
->leftJoin('service_work b', 'a.id = b.master_worker_id'.$this->sqlJoin)
|
|
|
->where($queryWhere)
|
|
|
+ ->where($this->queryDataWhere())
|
|
|
->group('a.id')
|
|
|
->order('a.id desc')
|
|
|
->limit($this->limitOffset, $this->limitLength)
|
|
|
@@ -160,6 +161,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
|
|
|
])
|
|
|
->leftJoin('service_work b', 'a.id = b.master_worker_id'.$this->sqlJoin)
|
|
|
->where($queryWhere)
|
|
|
+ ->where($this->queryDataWhere())
|
|
|
->group('a.id')
|
|
|
->count();
|
|
|
}
|