fix

张世平 · 张世平 · commit da7ad81eeb2b · 2024-07-05T17:33:12.000+08:00
diff --git a/app/Http/Controllers/Traits/ResourceController.php b/app/Http/Controllers/Traits/ResourceController.php
@@ -361,15 +361,9 @@ protected function existFullTextSearch(){
         return $this->hasFullTextSearch;
     }
 
-    /**
-     * 获取翻页数据
-     */
-    public function getList()
-    {
-        $this->selectValidate();
-        $this->bindModel = $this->bindModel();
+    protected function selectIndexFields(&$query,&$fields=[],&$primary_key=''){
         //指定查询字段
-        $fields = $this->selectFields($this->showIndexFields,$this->bindModel);
+        $fields = $this->selectFields($this->showIndexFields,$query);
         //判断是否包含主键字段,没有包含自动添加
         $model = $this->newBindModel();
         $primary_key = $model->getKeyName();
@@ -388,9 +382,22 @@ public function getList()
         }
         $hasFullTextSearch = $this->existFullTextSearch();
         if($fields && !$hasFullTextSearch){
-            $this->bindModel = $this->bindModel->select($fields);
+            $query = $query->select($fields);
         }
+        return $query;
+    }
 
+    /**
+     * 获取翻页数据
+     */
+    public function getList()
+    {
+        $this->selectValidate();
+        $this->bindModel = $this->bindModel();
+        $primary_key = '';
+        $fields = [];
+        $hasFullTextSearch = $this->existFullTextSearch();
+        $this->bindModel = $this->selectIndexFields($this->bindModel,$fields,$primary_key);
         //获取带有筛选条件的对象
         $obj = $this->getWithOptionModel();
         $obj = $this->handleList($obj);
