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

修正

Browse Source
This commit is contained in:
thinkphp
2016-11-28 23:24:48 +08:00
parent 7a79071d1a
commit fedfd9c857
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -917,6 +917,9 @@ class Query
if (is_array($field)) {
// 数组批量查询
$where = $field;
foreach ($where as $k => $val) {
$this->options['multi'][$k][] = $val;
}
} elseif ($field && is_string($field)) {
// 字符串查询
$where[$field] = ['null', ''];
@@ -938,13 +941,25 @@ class Query
if (!isset($this->options['where'][$logic])) {
$this->options['where'][$logic] = [];
}
if (isset($this->options['multi'][$field]) && count($this->options['multi'][$field]) > 1) {
if (is_string($field) && $this->checkMultiField($field)) {
$where[$field] = $this->options['multi'][$field];
} elseif (is_array($field)) {
foreach ($field as $key => $val) {
if ($this->checkMultiField($key)) {
$where[$key] = $this->options['multi'][$key];
}
}
}
$this->options['where'][$logic] = array_merge($this->options['where'][$logic], $where);
}
}
// 检查是否存在一个字段多次查询条件
private function checkMultiField($field)
{
return isset($this->options['multi'][$field]) && count($this->options['multi'][$field]) > 1;
}
/**
* 去除某个查询条件
* @access public