fix: get embeds field

tienanhbui · Apr 9, 2020 · 559ff24 · 559ff24
1 parent 02f3cf2
commit 559ff24
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -282,17 +282,19 @@ public function decorEmbed($model, $params)
         foreach ($params['embeds'] as $embed) {
             $method = $embed . 'EmbedConfig';
             $embedInfo = method_exists($model, $method) ? call_user_func([$model, $method]) : [];
-            $embedTable = isset($embedInfo['table']) ? $embedInfo['table'] : $embed;
-            $embedColumns = isset($embedInfo['columns']) ? $embedInfo['columns'] : [];
-            if ($embedInfo) {
-                if ($embedsFields && isset($embedsFields[$embed])) {
-                    $embedColumns = $embedsFields[$embed];
-                }
-                foreach ($embedColumns as &$column) {
-                    $column = $embedTable . '.' . $column;
+            $embedTable = isset($embedInfo['table']) ? $embedInfo['table'] : '';
+            $embedColumns = isset($embedInfo['columns']) ? $embedInfo['columns'] : null;
+            if ($embedsFields && isset($embedsFields[$embed])) {
+                $embedColumns = $embedsFields[$embed];
+            }
+            if ($embedColumns) {
+                if ($embedTable) {
+                    foreach ($embedColumns as &$column) {
+                        $column = $embedTable . '.' . $column;
+                    }
                 }
-                $embeds[$embed] = function ($query) use ($embedColumns) {
-                    $query->get($embedColumns);
+                $embeds[$embed] =  function ($query) use ($embedColumns) {
+                    $query->select($embedColumns);
                 };
             } else {
                 $embeds[] = $embed;