fix: 修改生成

app/admin/controller/Enrol/EnrolAq.php

@@ -5,6 +5,7 @@ namespace app\admin\controller\Enrol;
 use app\BaseController;
 use app\common\model\Enrol\EnrolAq as ModelEnrolAq;
 use app\Request;
+use think\facade\Request as  FacadeRequest;
 use think\Validate;
 use think\exception\ValidateException;
 use think\facade\Filesystem;
@@ -19,8 +20,9 @@ class EnrolAq extends BaseController
 {
     /**
      * 获取招生问答列表
+     * @param bool $isExport 是否导出
      */
-    public function getEnrolAqList(Request $request): array
+    public function getEnrolAqList(Request $request, $isExport = false): array
     {
         $params = $request->param();
         $con = [];
@@ -38,13 +40,16 @@ class EnrolAq extends BaseController
                 'enrol_aq_answer_status'
             ])
             ->append(['enrol_aq_answer_status_bool'])
-            ->withAttr('enrol_aq_answer_status_bool', function ($value,$data) {
-                if($data['enrol_aq_answer_status'] == 1) return true;
-                if($data['enrol_aq_answer_status'] == 2) return false;
-            })
+            ->withAttr(
+                'enrol_aq_answer_status_bool',
+                function ($value, $data) {
+                    if ($data['enrol_aq_answer_status'] == 1) return true;
+                    if ($data['enrol_aq_answer_status'] == 2) return false;
+                }
+            )
             ->order('enrol_aq_sort', 'asc');
 
-        return msg("获取招生问答列表成功!", $query);
+        return $isExport ? $query->select()->toArray() : msg("获取招生问答列表成功!", $query);
     }
 
     /**
@@ -58,12 +63,12 @@ class EnrolAq extends BaseController
             $params = $request->param();
             $this->validate($params, []);
 
-            
+
             $model = ModelEnrolAq::where('enrol_aq_guid', $params['enrol_aq_guid'])->find();
             if (!$model) throwErrorMsg("该招生问答不存在", 1);
 
-            if(isset($params['enrol_aq_answer']) && $params['enrol_aq_answer']){
-                if($model->enrol_aq_answer_status == 1){
+            if (isset($params['enrol_aq_answer']) && $params['enrol_aq_answer']) {
+                if ($model->enrol_aq_answer_status == 1) {
                     $params['enrol_aq_status'] = 2;
                     $params['enrol_aq_answer_status'] = 2;
                 }
@@ -77,7 +82,7 @@ class EnrolAq extends BaseController
                 'enrol_aq_status',
                 'enrol_aq_answer_status'
             ])->save($params);
-            
+
             Db::commit();
             return msg('编辑成功!');
         } catch (\Throwable $th) {
@@ -115,9 +120,6 @@ class EnrolAq extends BaseController
      */
     public function exportExcel(Request $request)
     {
-        $params = $request->param();
-        $params['limit'] = 10000;
-        $select = self::getEnrolAqList($request)['data'];
-        return ModelEnrolAq::exportExcel($select);
+        ModelEnrolAq::exportExcel(self::getEnrolAqList($request, true));
     }
 }

app/admin/controller/Gen/Gen.php

@@ -420,6 +420,7 @@ class Gen extends BaseController
             'functionName' => $tableInfo['Comment'],
             'functionAuthor' => 'admin',
             'genType' => 1,
+            'isSort' => 0,
             'genPath' => $this->address, // 自定义路径
             'options' => json_encode($options),
             'create_time'   =>  date('Y-m-d H:i:s'),
@@ -611,6 +612,7 @@ class Gen extends BaseController
         $where_content_arr = []; //列表查询条件
         $init_fields = []; //初始化(业务字段)
         $is_img_upload = false;
+        $isSort = $table['isSort']; // 排序处理
         $add_require_fields = []; //新增必填字段
         $edit_require_fields = []; //编辑必填字段
         foreach ($fields as $key => $val) {
@@ -631,6 +633,10 @@ class Gen extends BaseController
             if ($val['htmlType'] == 'fileUpload') $is_file_upload = true;
         }
 
+        if($isSort){
+            
+        }
+
         //打开模板文件资源(只读)
         $temp_res_r = fopen($temp_path, "r");
         //获取模板内容

app/api/controller/ExaminationInformation/InfoArticle.php

@@ -38,7 +38,6 @@ class InfoArticle extends BaseController
             ->order('info_article_type_sort', 'asc')
             ->select();
 
-        $idx = $params['idx'];
         $params['info_article_type_id'] = null;
         foreach ($type as $key => $value) {
             if($key == $params['idx']){