改进where数组查询

Author: liu21st

src/db/concern/WhereQuery.php

@@ -48,7 +48,7 @@ public function where($field, $op = null, $condition = null)
         $param = func_get_args();
         array_shift($param);
 
-        if (is_array($field)) {
+        if (is_array($field) && !empty($field) && array_is_list($field)) {
             return $this->where(function ($query) use ($param, $condition, $op, $field) {
                 return $query->parseWhereExp('AND', $field, $op, $condition, $param);
             });
@@ -96,7 +96,7 @@ public function whereOr($field, $op = null, $condition = null)
         $param = func_get_args();
         array_shift($param);
 
-        if (is_array($field) && !empty($field)) {
+        if (is_array($field) && !empty($field) && array_is_list($field)) {
             return $this->where(function ($query) use ($param, $condition, $op, $field) {
                 return $query->parseWhereExp('OR', $field, $op, $condition, $param);
             });
@@ -119,7 +119,7 @@ public function whereXor($field, $op = null, $condition = null)
         $param = func_get_args();
         array_shift($param);
 
-        if (is_array($field) && !empty($field)) {
+        if (is_array($field) && !empty($field) && array_is_list($field)) {
             return $this->where(function ($query) use ($param, $condition, $op, $field) {
                 return $query->parseWhereExp('XOR', $field, $op, $condition, $param);
             });