改进数组查询

top-think · Nov 12, 2024 · a951459 · a951459
1 parent c33edac
commit a951459
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/db/concern/WhereQuery.php b/src/db/concern/WhereQuery.php
@@ -48,6 +48,15 @@ public function where($field, $op = null, $condition = null)
         $param = func_get_args();
         array_shift($param);
 
+        if (is_array($field) && is_array($field[0])) {
+            $logic = is_string($op) && 'or' == strtolower($op) ? 'OR' : 'AND';
+            return $this->parseWhereExp($logic, function($query) use($field) {
+                foreach($field as $item) {
+                    $query->where($item[0], $item[1], $item[2]);
+                }
+            }, null, null);
+        }
+
         return $this->parseWhereExp('AND', $field, $op, $condition, $param);
     }
 
@@ -91,6 +100,15 @@ public function whereOr($field, $op = null, $condition = null)
         $param = func_get_args();
         array_shift($param);
 
+        if (is_array($field) && is_array($field[0])) {
+            $logic = is_string($op) && 'or' == strtolower($op) ? 'OR' : 'AND';
+            return $this->parseWhereExp($logic, function($query) use($field) {
+                foreach($field as $item) {
+                    $query->whereOr($item[0], $item[1], $item[2]);
+                }
+            }, null, null);
+        }
+
         return $this->parseWhereExp('OR', $field, $op, $condition, $param);
     }