禁用的国家不显示

beike/Admin/Http/Controllers/SettingController.php

@@ -40,7 +40,7 @@ class SettingController extends Controller
         ];
 
         $data = [
-            'countries' => CountryRepo::all(),
+            'countries' => CountryRepo::listEnabled(),
             'currencies' => CurrencyRepo::listEnabled(),
             'tax_address' => $tax_address,
             'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(),

beike/Repositories/CountryRepo.php

@@ -13,6 +13,8 @@ namespace Beike\Repositories;
 
 use Beike\Models\Country;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 
 class CountryRepo
 {
@@ -100,6 +102,21 @@ class CountryRepo
         return $builder->paginate(20)->withQueryString();
     }
 
+
+    /**
+     * 获取已启用国家列表
+     * @return Builder[]|Collection
+     */
+    public static function listEnabled(): Collection|array
+    {
+        return Country::query()->where('status', true)->select('id', 'name')->get();
+    }
+
+
+    /**
+     * 获取所有国家列表
+     * @return Builder[]|Collection
+     */
     public static function all()
     {
         return Country::query()->select('id', 'name')->get();