diff --git a/app/Domains/Virtual/Exports/CardExport.php b/app/Domains/Virtual/Exports/CardExport.php
index d46a12f1..98705fed 100644
--- a/app/Domains/Virtual/Exports/CardExport.php
+++ b/app/Domains/Virtual/Exports/CardExport.php
@@ -31,18 +31,15 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With
 
         // 添加卡属性匹配查找
         $properties = app(PropertyRepository::class)->select(['company_id', 'package_id', 'product', 'package'])->get();
-        if (isset($this->conditions['prop_product']) && isset($this->conditions['prop_package'])) {
-            $props = $properties->where('product', $this->conditions['prop_product'])->where($this->conditions['prop_package'])->get();
-            $this->conditions['company_id'] = $props->pluck('company_id')->toArray();
-            $this->conditions['package_id'] = $props->pluck('package_id')->toArray();
-        } elseif (isset($this->conditions['prop_product'])) {
-            $props = $properties->where('product', $this->conditions['prop_product'])->get();
-            $this->conditions['company_id'] = $props->pluck('company_id')->toArray();
-            $this->conditions['package_id'] = $props->pluck('package_id')->toArray();
-        } elseif (isset($this->conditions['prop_package'])) {
-            $props = $properties->where('package', $this->conditions['prop_package'])->get();
-            $this->conditions['company_id'] = $props->pluck('company_id')->toArray();
-            $this->conditions['package_id'] = $props->pluck('package_id')->toArray();
+        if (isset($conditions['prop_product']) && isset($conditions['prop_package'])) {
+            $conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
+            $conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
+        } elseif (isset($conditions['prop_product'])) {
+            $conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->pluck('company_id')->toArray();
+            $conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->pluck('package_id')->toArray();
+        } elseif (isset($conditions['prop_package'])) {
+            $conditions['company_id'] = $properties->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
+            $conditions['package_id'] = $properties->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
         }
 
         $builder = app(OrderCardPartitionRepository::class)->forceNoReset()->withConditions($this->conditions)->orderBy('sim')->applyConditions();
diff --git a/app/Domains/Virtual/Services/CardService.php b/app/Domains/Virtual/Services/CardService.php
index 2654fdc9..db90dc52 100644
--- a/app/Domains/Virtual/Services/CardService.php
+++ b/app/Domains/Virtual/Services/CardService.php
@@ -45,17 +45,14 @@ class CardService extends Service
         // 添加卡属性匹配查找
         $properties = app(PropertyRepository::class)->select(['company_id', 'package_id', 'product', 'package'])->get();
         if (isset($conditions['prop_product']) && isset($conditions['prop_package'])) {
-            $props = $properties->where('product', $conditions['prop_product'])->where($conditions['prop_package'])->get();
-            $conditions['company_id'] = $props->pluck('company_id')->toArray();
-            $conditions['package_id'] = $props->pluck('package_id')->toArray();
+            $conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
+            $conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
         } elseif (isset($conditions['prop_product'])) {
-            $props = $properties->where('product', $conditions['prop_product'])->get();
-            $conditions['company_id'] = $props->pluck('company_id')->toArray();
-            $conditions['package_id'] = $props->pluck('package_id')->toArray();
+            $conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->pluck('company_id')->toArray();
+            $conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->pluck('package_id')->toArray();
         } elseif (isset($conditions['prop_package'])) {
-            $props = $properties->where('package', $conditions['prop_package'])->get();
-            $conditions['company_id'] = $props->pluck('company_id')->toArray();
-            $conditions['package_id'] = $props->pluck('package_id')->toArray();
+            $conditions['company_id'] = $properties->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
+            $conditions['package_id'] = $properties->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
         }