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

调整HasMany类的has和hasWhere方法，取消第一个参数

Browse Source
This commit is contained in:
thinkphp
2017-01-16 17:36:15 +08:00
parent 04c81ca6b5
commit ff4be602c0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Model.php
View File

@@ -1237,9 +1237,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
$model = new static(); $model = new static();
if (is_array($operator) || $operator instanceof \Closure) { if (is_array($operator) || $operator instanceof \Closure) {
return $model->$relation()->hasWhere($model, $operator); return $model->$relation()->hasWhere($operator);
} }
return $model->$relation()->has($model, $operator, $count, $id); return $model->$relation()->has($operator, $count, $id);
} }
/** /**
@@ -1252,7 +1252,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function hasWhere($relation, $where = []) public static function hasWhere($relation, $where = [])
{ {
$model = new static(); $model = new static();
return $model->$relation()->hasWhere($model, $where); return $model->$relation()->hasWhere($where);
} }
/** /**

22
library/think/model/relation/HasMany.php
View File

@@ -212,16 +212,15 @@ class HasMany extends Relation
/** /**
* 根据关联条件查询当前模型 * 根据关联条件查询当前模型
* @access public * @access public
* @param Model $model 模型对象
* @param string $operator 比较操作符 * @param string $operator 比较操作符
* @param integer $count 个数 * @param integer $count 个数
* @param string $id 关联表的统计字段 * @param string $id 关联表的统计字段
* @return Query * @return Query
*/ */
public function has($model, $operator = '>=', $count = 1, $id = '*') public function has($operator = '>=', $count = 1, $id = '*')
{ {
$table = $this->query->getTable(); $table = $this->query->getTable();
return $model->db()->alias('a') return $this->parent->db()->alias('a')
->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $this->joinType) ->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $this->joinType)
->group('b.' . $this->foreignKey) ->group('b.' . $this->foreignKey)
->having('count(' . $id . ')' . $operator . $count); ->having('count(' . $id . ')' . $operator . $count);
@@ -230,24 +229,25 @@ class HasMany extends Relation
/** /**
* 根据关联条件查询当前模型 * 根据关联条件查询当前模型
* @access public * @access public
* @param Model $model 模型对象 * @param mixed $where 查询条件（数组或者闭包）
* @param mixed $where 查询条件（数组或者闭包）
* @return Query * @return Query
*/ */
public function hasWhere($model, $where = []) public function hasWhere($where = [])
{ {
$table = $this->query->getTable(); $table = $this->query->getTable();
$model = basename(str_replace('\\', '/', get_class($this->parent)));
$relation = basename(str_replace('\\', '/', $this->model));
if (is_array($where)) { if (is_array($where)) {
foreach ($where as $key => $val) { foreach ($where as $key => $val) {
if (false === strpos($key, '.')) { if (false === strpos($key, '.')) {
$where['b.' . $key] = $val; $where[$relation . '.' . $key] = $val;
unset($where[$key]); unset($where[$key]);
} }
} }
} }
return $model->db()->alias('a') return $this->parent->db()->alias($model)
->field('a.*') ->field($model . '.*')
->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $this->joinType) ->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
->where($where); ->where($where);
} }