|
@@ -38,9 +38,9 @@ class BasicTypeService extends Service
|
|
|
public function basicTypeList($data){
|
|
|
$model = BasicType::where('del_time',0)
|
|
|
->select('title','id','type')
|
|
|
- ->orderby('id', 'asc')
|
|
|
- ->where('type',$data['type']);
|
|
|
+ ->orderby('id', 'asc');
|
|
|
|
|
|
+ if(! empty($data['type'])) $model->where('type',$data['type']);
|
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|