From 9abd51cc6ba256918b283370b15c13ec7f2d8d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=80=E5=88=80?= <daodao97@foxmail.com>
Date: Wed, 16 Jun 2021 09:56:41 +0800
Subject: [PATCH] Update AbstractController.php

---
 .../src/Scaffold/Controller/AbstractController.php           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/base-utils/src/Scaffold/Controller/AbstractController.php b/src/base-utils/src/Scaffold/Controller/AbstractController.php
index 9ea4156..56d4bc5 100644
--- a/src/base-utils/src/Scaffold/Controller/AbstractController.php
+++ b/src/base-utils/src/Scaffold/Controller/AbstractController.php
@@ -208,7 +208,7 @@ abstract class AbstractController extends Controller
             $order_by = $sortColumn . ' ' . $sortType;
         }
         if (empty($conditions) && !($this->options['defaultList'] ?? true)) {
-            return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options','group_by');
+            return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options', 'group_by');
         }
         if (method_exists($this, 'beforeListQuery')) {
             $hook_params = get_class_method_params_name($this, 'beforeListQuery');
@@ -220,7 +220,7 @@ abstract class AbstractController extends Controller
                 $this->beforeListQuery($conditions, $order_by, $group_by, $columns);
             }
         }
-        return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options','group_by');
+        return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options', 'group_by');
     }
 
     /**
@@ -238,7 +238,6 @@ abstract class AbstractController extends Controller
             $group_by
         ] = array_values($this->makeWhere());
         $entity = $this->getEntity();
-//        $count = $entity->count($conditions);
         if ($group_by) {
             $entity->getModel()->groupBy($group_by);
             $count_query = clone $entity;