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-09 18:36:56 +08:00
parent 1f913041b7
commit df9e8eb0c5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Traits/QueryTrait.php
+5 -1
View File
@@ -15,6 +15,7 @@ use Database\ActiveQuery;
use Database\ActiveRecord; use Database\ActiveRecord;
use Database\Condition\MathematicsCondition; use Database\Condition\MathematicsCondition;
use Database\Query; use Database\Query;
use Database\SqlBuilder;
use Exception; use Exception;
use ReflectionException; use ReflectionException;
use Snowflake\Exception\NotFindClassException; use Snowflake\Exception\NotFindClassException;
@@ -505,7 +506,10 @@ trait QueryTrait
if ($conditionArray instanceof Closure) { if ($conditionArray instanceof Closure) {
$conditionArray = $this->makeClosureFunction($conditionArray); $conditionArray = $this->makeClosureFunction($conditionArray);
} }
$this->where = ['or', $conditionArray];
$oldWhere = SqlBuilder::builder((new Query())->where($this->where))->getCondition();
$this->where = ['or', $conditionArray, $oldWhere];
return $this; return $this;
} }