|
@@ -50,7 +50,7 @@ class ServicesController extends Curd{
|
|
|
// if ($request->get('return')){
|
|
|
// $where['order_return.order_return_status'] = $request->get('return');
|
|
|
// }
|
|
|
- if ($request->get('goods_classify') || $request->get('goods_name')){
|
|
|
+ // if ($request->get('goods_classify') || $request->get('goods_name')){
|
|
|
$where['order_id'] = '';
|
|
|
$goodsClassify = 'SERVICE';
|
|
|
$goodsName = $request->get('goods_name','');
|
|
@@ -75,7 +75,7 @@ class ServicesController extends Curd{
|
|
|
$where['order_id'] = ['in',implode(',',$orderIds)];
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
$query = $this->doSelect($where, $field, $order);
|
|
|
return $this->doFormat($query, $format, $limit);
|