|
@@ -73,8 +73,7 @@ class Formula extends Backend
|
|
|
$map['company_id'] = $user_info['company_id'];
|
|
$map['company_id'] = $user_info['company_id'];
|
|
|
$map['examine_status'] = 2;
|
|
$map['examine_status'] = 2;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- if(!empty($map['name'])){
|
|
|
|
|
|
|
+ if(!empty($map['name'])||!empty($map['material'])){
|
|
|
$sort = 'f.id';
|
|
$sort = 'f.id';
|
|
|
$list = DB::name('formula')
|
|
$list = DB::name('formula')
|
|
|
->where($where)
|
|
->where($where)
|
