|
|
@@ -452,8 +452,6 @@ class QuantizationService extends Service
|
|
|
->select($field)
|
|
|
->orderby('id', 'desc');
|
|
|
|
|
|
- if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
|
|
|
- if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
|
if(! empty($data['type'])) $model->where('type', $data['type']);
|
|
|
if(! empty($data['id'])) $model->whereIn('id', $data['id']);
|
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
|
|
|
@@ -467,11 +465,12 @@ class QuantizationService extends Service
|
|
|
$model->where('end_time','<=',$return[1]);
|
|
|
}
|
|
|
|
|
|
- return $model;
|
|
|
+ return [true, $model];
|
|
|
}
|
|
|
|
|
|
public function quantizationCreateList($data,$user){
|
|
|
- $model = $this->quantizationCreateCommon($data, $user);
|
|
|
+ list($status,$model) = $this->quantizationCreateCommon($data, $user);
|
|
|
+ if(! $status) return [false,$model];
|
|
|
$list = $this->limit($model,'',$data);
|
|
|
$list = $this->fillCreateData($list,$user);
|
|
|
|