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

改进Query类条件查询一处问题

Browse Source
This commit is contained in:
thinkphp
2017-01-12 10:45:21 +08:00
parent 74a5101c9a
commit 5b5e7373e7
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1175,18 +1175,18 @@ class Query
$this->bind($param[2]); $this->bind($param[2]);
} }
// 记录一个字段多次查询条件 // 记录一个字段多次查询条件
$this->options['multi'][$field][] = $where[$field]; $this->options['multi'][$logic][$field][] = $where[$field];
} }
if (!empty($where)) { if (!empty($where)) {
if (!isset($this->options['where'][$logic])) { if (!isset($this->options['where'][$logic])) {
$this->options['where'][$logic] = []; $this->options['where'][$logic] = [];
} }
if (is_string($field) && $this->checkMultiField($field)) { if (is_string($field) && $this->checkMultiField($field, $logic)) {
$where[$field] = $this->options['multi'][$field]; $where[$field] = $this->options['multi'][$logic][$field];
} elseif (is_array($field)) { } elseif (is_array($field)) {
foreach ($field as $key => $val) { foreach ($field as $key => $val) {
if ($this->checkMultiField($key)) { if ($this->checkMultiField($key, $logic)) {
$where[$key] = $this->options['multi'][$key]; $where[$key] = $this->options['multi'][$logic][$key];
} }
} }
} }
@@ -1194,10 +1194,16 @@ class Query
} }
} }
// 检查是否存在一个字段多次查询条件 /**
private function checkMultiField($field) * 检查是否存在一个字段多次查询条件
* @access public
* @param string $field 查询字段
* @param string $logic 查询逻辑 and or xor
* @return bool
*/
private function checkMultiField($field, $logic)
{ {
return isset($this->options['multi'][$field]) && count($this->options['multi'][$field]) > 1; return isset($this->options['multi'][$logic][$field]) && count($this->options['multi'][$logic][$field]) > 1;
} }
/** /**