改进order方法解析

top-think · Aug 13, 2018 · 673e505 · 673e505
1 parent 9c98b15
commit 673e505
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
@@ -865,10 +865,12 @@ protected function parseOrder(Query $query, $order)
                 } else {
                     $sort = $val;
                 }
-
-                $sort    = strtoupper($sort);
-                $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
-                $array[] = $this->parseKey($query, $key, true) . $sort;
+
+                if (false === strpos($key, ')') && false === strpos($key, '#')) {
+                                    $sort = strtoupper($sort);
+                                    $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+                    $array[] = $this->parseKey($query, $key, true) . $sort;
+                }
             }
         }