From 0bd711d27661a89af95807d4cd373c833f861439 Mon Sep 17 00:00:00 2001 From: denghy Date: Fri, 22 Feb 2019 15:58:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8!empty=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Virtual/Repositories/CompanyRepository.php | 4 ++-- .../Virtual/Repositories/Concerns/OrderCardConcern.php | 4 ++-- app/Domains/Virtual/Repositories/FlowPoolRepository.php | 4 ++-- app/Domains/Virtual/Repositories/OrderRepository.php | 8 ++++---- app/Domains/Virtual/Repositories/PackageRepository.php | 4 ++-- app/Domains/Virtual/Repositories/ProductRepository.php | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Domains/Virtual/Repositories/CompanyRepository.php b/app/Domains/Virtual/Repositories/CompanyRepository.php index b06c18fd..04f6ced5 100644 --- a/app/Domains/Virtual/Repositories/CompanyRepository.php +++ b/app/Domains/Virtual/Repositories/CompanyRepository.php @@ -60,8 +60,8 @@ class CompanyRepository extends Repository $this->model = $this->model->whereIn('id', $conditions['id']); } - if (isset($conditions['name'])) { - $this->model = $this->model->where('name', $conditions['name']); + if (!empty($conditions['name'])) { + $this->model = $this->model->where('name', 'like', "%{$conditions['name']}%"); } if (isset($conditions['status'])) { diff --git a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php index 65d12c97..f18f82d2 100644 --- a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php +++ b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php @@ -57,13 +57,13 @@ trait OrderCardConcern $query->where('unit_price', $conditions['unit_price']); } - if (isset($conditions['company_name'])) { + if (!empty($conditions['company_name'])) { $query->whereHas('company', function ($relation) use ($conditions) { $relation->withTrashed()->where('name', $conditions['company_name']); }); } - if (isset($conditions['package_name'])) { + if (!empty($conditions['package_name'])) { $query->whereHas('package', function ($relation) use ($conditions) { $relation->withTrashed()->where('name', $conditions['package_name']); }); diff --git a/app/Domains/Virtual/Repositories/FlowPoolRepository.php b/app/Domains/Virtual/Repositories/FlowPoolRepository.php index 445e9819..29cbc169 100644 --- a/app/Domains/Virtual/Repositories/FlowPoolRepository.php +++ b/app/Domains/Virtual/Repositories/FlowPoolRepository.php @@ -62,11 +62,11 @@ class FlowPoolRepository extends Repository $this->model = $this->model->where('carrier_operator', $conditions['carrier_operator']); } - if (isset($conditions['name'])) { + if (!empty($conditions['name'])) { $this->model = $this->model->where('name', 'like', "%{$conditions['name']}%"); } - if (isset($conditions['company_name'])) { + if (!empty($conditions['company_name'])) { $this->model = $this->model->whereHas('company', function ($relation) use ($conditions) { $relation->withTrashed()->where('name', $conditions['company_name']); }); diff --git a/app/Domains/Virtual/Repositories/OrderRepository.php b/app/Domains/Virtual/Repositories/OrderRepository.php index eb7eff0f..828dcb6a 100644 --- a/app/Domains/Virtual/Repositories/OrderRepository.php +++ b/app/Domains/Virtual/Repositories/OrderRepository.php @@ -76,8 +76,8 @@ class OrderRepository extends Repository $query->whereIn('company_id', $conditions['company_id']); } - if (isset($conditions['sn'])) { - $query->where('sn', $conditions['sn']); + if (!empty($conditions['sn'])) { + $query->where('sn', "%{$conditions['sn']}%"); } if (isset($conditions['order_status'])) { @@ -98,13 +98,13 @@ class OrderRepository extends Repository $query->where('pay_channel', $conditions['pay_channel']); } - if (isset($conditions['company_name'])) { + if (!empty($conditions['company_name'])) { $query->whereHas('company', function ($relation) use ($conditions) { $relation->withTrashed()->where('name', $conditions['company_name']); }); } - if (isset($conditions['package_name'])) { + if (!empty($conditions['package_name'])) { $query->whereHas('package', function ($relation) use ($conditions) { $relation->withTrashed()->where('name', $conditions['package_name']); }); diff --git a/app/Domains/Virtual/Repositories/PackageRepository.php b/app/Domains/Virtual/Repositories/PackageRepository.php index 950477ed..ba16dac8 100644 --- a/app/Domains/Virtual/Repositories/PackageRepository.php +++ b/app/Domains/Virtual/Repositories/PackageRepository.php @@ -65,11 +65,11 @@ class PackageRepository extends Repository $this->model = $this->model->where('type', $conditions['type']); } - if (isset($conditions['sn'])) { + if (!empty($conditions['sn'])) { $this->model = $this->model->where('sn', "%{$conditions['sn']}%"); } - if (isset($conditions['name'])) { + if (!empty($conditions['name'])) { $this->model = $this->model->where('name', 'like', "%{$conditions['name']}%"); } diff --git a/app/Domains/Virtual/Repositories/ProductRepository.php b/app/Domains/Virtual/Repositories/ProductRepository.php index ea1ab40c..b13cc4a3 100644 --- a/app/Domains/Virtual/Repositories/ProductRepository.php +++ b/app/Domains/Virtual/Repositories/ProductRepository.php @@ -67,11 +67,11 @@ class ProductRepository extends Repository $query->where('status', $conditions['status']); } - if (isset($conditions['name'])) { + if (!empty($conditions['name'])) { $query->where('name', 'like', "%{$conditions['name']}%"); } - if (isset($conditions['package_name'])) { + if (!empty($conditions['package_name'])) { $query->whereHas('package', function ($relation) use ($conditions) { $relation->withTrashed()->where('name', $conditions['package_name']); });