diff --git a/app/Admin/Controllers/Store/StoreController.php b/app/Admin/Controllers/Store/StoreController.php index f552746..b35d2d6 100644 --- a/app/Admin/Controllers/Store/StoreController.php +++ b/app/Admin/Controllers/Store/StoreController.php @@ -35,7 +35,7 @@ class StoreController extends AdminController ->source(admin_url('api/keywords/tree-list?parent_key=store_category')) ->labelField('name') ->valueField('key') - ->onlyLeaf(true) + // ->onlyLeaf(true) ->clearable(), amis()->SelectControl()->name('business_id')->label(__('store.business_id'))->columnRatio(3) ->source(admin_url('api/keywords/tree-list?parent_key=store_business')) diff --git a/app/Admin/Filters/StoreFilter.php b/app/Admin/Filters/StoreFilter.php index c4c0cb6..79339aa 100644 --- a/app/Admin/Filters/StoreFilter.php +++ b/app/Admin/Filters/StoreFilter.php @@ -4,6 +4,7 @@ namespace App\Admin\Filters; use EloquentFilter\ModelFilter; use Illuminate\Support\Arr; +use App\Models\Keyword; class StoreFilter extends ModelFilter { @@ -19,7 +20,11 @@ class StoreFilter extends ModelFilter public function category($key) { - $this->where('category_id', $key); + //先获取所有子集 + $keys = Keyword::allChildrenOfKey($key)->get()->pluck('key')->toArray(); + //把本身放入数组; + array_push($keys, $key); + $this->whereIn('category_id', $keys); } public function business($key)