u

app/adminapi/lists/works/ServiceWorkLists.php

@@ -174,9 +174,9 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
                 $query->field('id,work_id,content,create_time');
             }
         ])
-//            ->where($this->searchWhere)
-//            ->where($this->queryWhere())
-//            ->where($this->queryDataWhere())
+            ->where($this->searchWhere)
+            ->where($this->queryWhere())
+            ->where($this->queryDataWhere())
             ->field(['id', 'work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat','appoint_approval','refund_approval','finally_door_time','property_activity_id','order_effective_id'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
@@ -193,7 +193,7 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
      */
     public function count(): int
     {
-        return ServiceWork::count();
+        return ServiceWork::where($this->searchWhere)->where($this->queryWhere())->where($this->queryDataWhere())->count();
     }
 
 }