|
@@ -439,7 +439,12 @@ class GoodsService
|
|
$query->where('goods_name', 'like', "%" . $keywords . "%");
|
|
$query->where('goods_name', 'like', "%" . $keywords . "%");
|
|
})
|
|
})
|
|
->when($goodsClassify != '', function ($query) use ($goodsClassify) {
|
|
->when($goodsClassify != '', function ($query) use ($goodsClassify) {
|
|
- $query->where('goods_classify', $goodsClassify);
|
|
|
|
|
|
+ if($goodsClassify == 'NOPACKAGE'){
|
|
|
|
+ $query->where('goods_classify','<>', 'PACKAGE');
|
|
|
|
+ }else{
|
|
|
|
+ $query->where('goods_classify', $goodsClassify);
|
|
|
|
+ }
|
|
|
|
+
|
|
})
|
|
})
|
|
->when($isSupportAppointment != '', function ($query) use ($isSupportAppointment) {
|
|
->when($isSupportAppointment != '', function ($query) use ($isSupportAppointment) {
|
|
$query->where('is_support_appointment', $isSupportAppointment);
|
|
$query->where('is_support_appointment', $isSupportAppointment);
|