|
@@ -65,11 +65,8 @@ class ProductService extends Service
|
|
->orderby('id','desc');
|
|
->orderby('id','desc');
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
|
|
|
|
- $list = $model->get()->toArray();
|
|
|
|
- if(! empty($list)) {
|
|
|
|
- $list = $this->makeTree(0,$list);
|
|
|
|
- $list = $this->set_sort_circle($list);
|
|
|
|
- }
|
|
|
|
|
|
+ $list = $this->limit($model,'',$data);
|
|
|
|
+ $list = $this->fillData($list);
|
|
|
|
|
|
return [true, $list];
|
|
return [true, $list];
|
|
}
|
|
}
|