改进

liu21st · liu21st · commit 728c0fc21e9b · 2018-09-12T18:02:21.000+08:00
diff --git a/ThinkPHP/Library/Think/Db/Driver.class.php b/ThinkPHP/Library/Think/Db/Driver.class.php
@@ -764,7 +764,7 @@ protected function parseOrder($order)
                     if (false === strpos($val, '(')) {
                         $array[] = $this->parseKey($val);
                     }
-                } else {
+                } elseif (false === strpos($key, ')') && false === strpos($key, '#')) {
                     $sort    = in_array(strtolower($val), array('asc', 'desc')) ? ' ' . $val : '';
                     $array[] = $this->parseKey($key, true) . $sort;
                 }

Original file line number	Diff line number	Diff line change
`@@ -764,7 +764,7 @@ protected function parseOrder($order)`
`764`	`764`	`if (false === strpos($val, '(')) {`
`765`	`765`	`$array[] = $this->parseKey($val);`
`766`	`766`	`}`
`767`		`- } else {`
	`767`	`+ } elseif (false === strpos($key, ')') && false === strpos($key, '#')) {`
`768`	`768`	`$sort = in_array(strtolower($val), array('asc', 'desc')) ? ' ' . $val : '';`
`769`	`769`	`$array[] = $this->parseKey($key, true) . $sort;`
`770`	`770`	`}`