|
|
@@ -85,12 +85,12 @@ class SpuDao extends BaseDao
|
|
|
})
|
|
|
->when(isset($where['type']), function($query) use($where) {
|
|
|
if ($where['type'] === '') {
|
|
|
- $query->whereIn('P.type', [0,1,2,3,4]);
|
|
|
+// $query->whereIn('P.type', [0,1,2,3,4]);
|
|
|
} else {
|
|
|
$query->where('P.type', (int)$where['type']);
|
|
|
}
|
|
|
}, function($query) {
|
|
|
- $query->whereIn('P.type', [0,1,2,3,4]);
|
|
|
+// $query->whereIn('P.type', [0,1,2,3,4]);
|
|
|
})
|
|
|
->when(isset($where['keyword']) && $where['keyword'] !== '',function($query)use($where){
|
|
|
if (is_numeric($where['keyword'])) {
|
