改名

2021-08-10 10:31:56 +08:00
parent dbf4a018ef
commit 0d185b77f3
1 changed files with 1 additions and 4 deletions
@@ -476,10 +476,7 @@ trait QueryTrait
 		if ($conditionArray instanceof Closure) {
 			$conditionArray = $this->makeClosureFunction($conditionArray);
 		}
-
-		$oldWhere = '(' . implode(') AND (', $this->where) . ')';
-
-		$this->where = ['(' . $oldWhere . ') OR ' . $conditionArray];
+		$this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')'];
 		return $this;
 	}