as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-08-10 10:31:56 +08:00
parent dbf4a018ef
commit 0d185b77f3
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Traits/QueryTrait.php
+1 -4
View File
@@ -476,10 +476,7 @@ trait QueryTrait
if ($conditionArray instanceof Closure) { if ($conditionArray instanceof Closure) {
$conditionArray = $this->makeClosureFunction($conditionArray); $conditionArray = $this->makeClosureFunction($conditionArray);
} }
$this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')'];
$oldWhere = '(' . implode(') AND (', $this->where) . ')';
$this->where = ['(' . $oldWhere . ') OR ' . $conditionArray];
return $this; return $this;
} }