|
@@ -103,7 +103,8 @@ class OrderController extends AdminBaseController
|
|
|
->where(function (Query $query) use ($data) {
|
|
->where(function (Query $query) use ($data) {
|
|
|
if (!empty($data['keyword'])) {
|
|
if (!empty($data['keyword'])) {
|
|
|
$keyword = trim($data['keyword']);
|
|
$keyword = trim($data['keyword']);
|
|
|
- $query->where('o.order_sn|u.real_name|o.device_code', 'like', "%$keyword%");
|
|
|
|
|
|
|
+ $query->where('o.order_sn|u.real_name', 'like', "%$keyword%")
|
|
|
|
|
+ ->whereOr('o.device_code','=', $keyword);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$startTime = isset($data['start_time'])? $data['start_time'] : '';
|
|
$startTime = isset($data['start_time'])? $data['start_time'] : '';
|
