From eebef086e84ca09a7b43e716df566d990628a444 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Sat, 6 May 2023 10:10:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Gen/Gen.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/admin/controller/Gen/Gen.php b/app/admin/controller/Gen/Gen.php
index 4719ecd..3e3a9e7 100644
--- a/app/admin/controller/Gen/Gen.php
+++ b/app/admin/controller/Gen/Gen.php
@@ -345,13 +345,11 @@ class Gen extends BaseController
         try {
             if ($table['tplCategory'] == "web_static") {
                 $this->createAdminController($columns, $table);
-                // $this->createNewModel($columns, $table);
                 (new Model($columns, $table))->createNewModel();
                 $this->createJsWebStaticIndex($columns, $table);
                 $this->createJsApi($columns, $table);
             } else if ($table['tplCategory'] == "crud") {
                 $this->createAdminController($columns, $table);
-                // $this->createNewModel($columns, $table);
                 (new Model($columns, $table))->createNewModel();
                 $this->createJsVue($columns, $table);
                 $this->createJsAdd($columns, $table);
@@ -824,6 +822,7 @@ class Gen extends BaseController
             $className = $table['className'];
 
             if ($isSort == 1) {
+                
                 $sortTemplate = "
                 <!-- 排序 -->
                 <template #{$columnName}='scope'>
@@ -1991,7 +1990,7 @@ class Gen extends BaseController
                         \$params = \$request->param();
                         \$select = Model{$class_name}::field({$init_fields_arr_str})
                             ->order({$order_field}, $order_mode )
-                            ->select()->toArray();
+                            ->select();
                         return Model{$class_name}::exportExcel(\$select);
                     }";
             case 'export_mod':