mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 20:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正null查询的条件合并

Browse Source
This commit is contained in:
thinkphp
2017-01-12 12:17:53 +08:00
parent 1ab44ff8e7
commit b47fe5553b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/db/Query.php
View File

@@ -1158,13 +1158,15 @@ class Query
}
} elseif ($field && is_string($field)) {
// 字符串查询
$where[$field] = ['null', ''];
$where[$field] = ['null', ''];
$this->options['multi'][$logic][$field][] = $where[$field];
}
} elseif (is_array($op)) {
$where[$field] = $param;
} elseif (in_array(strtolower($op), ['null', 'notnull', 'not null'])) {
// null查询
$where[$field] = [$op, ''];
$where[$field] = [$op, ''];
$this->options['multi'][$logic][$field][] = $where[$field];
} elseif (is_null($condition)) {
// 字段相等查询
$where[$field] = ['eq', $op];