1

app/common/model/Goods.php

@@ -312,8 +312,7 @@ class Goods extends BaseModel
 
         //关键字搜索 wanghousheng
         if (!empty($param['keyword'])) {
-            $query = $query->where('goods_name', 'like', "%{$param['keyword']}%")
-                ->whereOr('goods_no', 'like', "%{$param['keyword']}%");
+            $query = $query->whereRaw('goods_name like ? or goods_no like ?', ["%{$param['keyword']}%", "%{$param['keyword']}%"]);
         }
         // 执行查询
         $list = $query->with(['images.file'])
@@ -479,7 +478,6 @@ class Goods extends BaseModel
         if (isset($param['profit_rate_max']) && $param['profit_rate_max'] !== '') {
             $filter[] = ['goods.profit_rate', '<=', $params['profit_rate_max']];
         }
-        $filter[] = ['goods.is_delete', '=', 0];
         // 实例化新查询对象
         return $query->where($filter);
     }