|
@@ -370,6 +370,7 @@ class ProductService extends Service
|
|
|
->orderby('id', 'desc');
|
|
|
|
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
|
+ if(isset($data['state'])) $model->where('state', $data['state']);
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
|
$list = $this->fillData($list);
|
|
@@ -417,6 +418,7 @@ class ProductService extends Service
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
$data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
|
|
|
$data['data'][$key]['product_category_name'] = $category[$value['product_category_id']] ?? '';
|
|
|
+ $data['data'][$key]['state_name'] = Product::$state[$value['state']] ?? '';
|
|
|
}
|
|
|
|
|
|
return $data;
|