修正order方法传数组的别名问题

Author: liu21st

src/db/BaseQuery.php

@@ -797,11 +797,7 @@ public function order(string | array | Raw $field, string $order = '')
         }
 
         if (is_string($field)) {
-            $field = $this->getFieldMap($field) ?: $field;
-            if (!empty($this->options['via']) && !str_contains($field, '.') && !str_contains($field, '->')) {
-                $field = $this->options['via'] . '.' . $field;
-            }
-
+            $field = $this->parseOrderField($this->getFieldMap($field) ?: $field);
             if (is_string($field) && strpos($field, '->')) {
                 [$alias, $attr] = explode('->', $field, 2);
 
@@ -820,9 +816,9 @@ public function order(string | array | Raw $field, string $order = '')
         } elseif (!empty($this->options['via'])) {
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $field[$key] = $this->options['via'] . '.' . $val;
+                    $field[$key] = $this->parseOrderField($val);
                 } else {
-                    $field[$this->options['via'] . '.' . $key] = $val;
+                    $field[$this->parseOrderField($key)] = $val;
                     unset($field[$key]);
                 }
             }
@@ -841,6 +837,13 @@ public function order(string | array | Raw $field, string $order = '')
         return $this;
     }
 
+    protected function parseOrderField(string $field): string
+    {
+        if (!empty($this->options['via']) && !str_contains($field, '.') && !str_contains($field, '->')) {
+            $field = $this->options['via'] . '.' . $field;
+        }
+        return $field;        
+    }
     /**
      * 分页查询.
      *