From eeda3e782ac6c2bfa7b9785edd86101245dafa76 Mon Sep 17 00:00:00 2001 From: denghy Date: Mon, 16 Dec 2019 19:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=B1=9E=E6=80=A7=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Virtual/Exports/CardExport.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Domains/Virtual/Exports/CardExport.php b/app/Domains/Virtual/Exports/CardExport.php index 94c32709..e88f8bd9 100644 --- a/app/Domains/Virtual/Exports/CardExport.php +++ b/app/Domains/Virtual/Exports/CardExport.php @@ -40,7 +40,9 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With $this->conditions['type'] = 0; // 添加卡属性匹配查找 - CardService::propConditions($this->conditions); + if (isset($this->conditions['prop_product']) || isset($this->conditions['prop_package'])) { + CardService::propConditions($this->conditions); + } return app(OrderCardPartitionRepository::class)->selectRaw("COUNT(*) AS count")->withConditions($this->conditions)->first()->count; } @@ -50,7 +52,9 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With $this->conditions['type'] = 0; // 添加卡属性匹配查找 - CardService::propConditions($this->conditions); + if (isset($this->conditions['prop_product']) || isset($this->conditions['prop_package'])) { + CardService::propConditions($this->conditions); + } $builder = app(OrderCardPartitionRepository::class)->forceNoReset()->skipCache()->withConditions($this->conditions)->orderBy('sim')->applyConditions();