laraveladmin-cn
diff --git a/‎app/Http/Controllers/Traits/ResourceController.php
Lines changed: 29 additions & 7 deletions b/‎app/Http/Controllers/Traits/ResourceController.php
Lines changed: 29 additions & 7 deletions
@@ -74,22 +74,44 @@ public function index()
         collect($this->sizer)->keys()->filter(function ($value) {
             return Str::endsWith($value, '_id');
         })->map(function ($value) use (&$data) {
-            $val = str_replace('_id', '', $value);
+            $val = collect(explode('.',$value))->last();
+            $val = Str::replaceLast('_id', '', $val);
             $model = '\App\Models\\' . Str::studly($val);
             $item = [];
-            $relation_id = Request::input('where.' . $value, 0);
+            $where = Request::input('where');
+            $relation_id = isset($where[$value])?$where[$value]:0;
             if ($relation_id && class_exists($model)) {
-                $fields = collect(isset($this->mapsWhereFields[$value]) ? $this->mapsWhereFields[$value] : ['id', 'name'])
+                $fields_and_relation = collect(isset($this->mapsWhereFields[$value]) ? $this->mapsWhereFields[$value] : ['id', 'name'])
                     ->map(function ($field){
                         if(is_string($field) && Str::contains($field,'`')){
                             return DB::raw($field);
                         }
                         return $field;
-                    })->toArray();
-                $item = collect($model::select($fields)
-                    ->find($relation_id))->toArray();
+                    });
+                $fields = $fields_and_relation->filter(function ($item){
+                    return !is_array($item);
+                })->toArray();
+                $relation = $fields_and_relation->filter(function ($item){
+                    return is_array($item);
+                })->map(function ($item){
+                    return function ($q)use($item){
+                        if($item){
+                            $q->select($item);
+                        }
+                        return $q;
+                    };
+                })->toArray();
+                $modelObj = $model::query();
+                if($fields){
+                    $modelObj = $modelObj->select($fields);
+                }
+                if($relation){
+                    $modelObj = $modelObj->with($relation);
+                }
+                $item = collect($modelObj->find($relation_id))->toArray();
             }
-            $data['maps'][$value] = $item ? [$item] : [];
+            $map = $item ? [$item] : [];
+            $data['maps'][$value] = $map;
         });
         //条件筛选及排序返回
         $this->addOptions();