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

改进Model类的 has和hasWhere方法

Browse Source
This commit is contained in:
thinkphp
2016-04-21 17:56:20 +08:00
parent b89991dc41
commit f39c6627da
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/Model.php
View File

@@ -604,10 +604,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$class = new static(); $class = new static();
$model = $class->$relation(); $model = $class->$relation();
$info = $class->getRelationInfo(); $info = $class->getRelationInfo();
$result = $model->group($info['foreignKey']) $table = $info['model']::getTable();
->having('count(' . $id . ')' . $operator . $count) return self::db()->alias('a')->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])->group('b.' . $info['foreignKey'])
->column($info['foreignKey']); ->having('count(' . $id . ')' . $operator . $count);
return self::db()->where($info['localKey'], 'in', $result);
} }
/** /**
@@ -622,10 +621,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$class = new static(); $class = new static();
$model = $class->$relation(); $model = $class->$relation();
$info = $class->getRelationInfo(); $info = $class->getRelationInfo();
$result = $model->group($info['foreignKey']) $table = $info['model']::getTable();
->where($where) if (is_array($where)) {
->column($info['foreignKey']); foreach ($where as $key => $val) {
return self::db()->where($info['localKey'], 'in', $result); if (false === strpos($key, '.')) {
$where['b.' . $key] = $val;
unset($where[$key]);
}
}
}
return self::db()->alias('a')->field('a.*')->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])->where($where);
} }
/** /**