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

改进Query类的find和select方法的默认值

Browse Source
This commit is contained in:
thinkphp
2016-06-21 10:58:19 +08:00
parent c4669f142d
commit 850376dfe7
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/model/Merge.php
View File

@@ -44,7 +44,7 @@ class Merge extends Model
* @param bool $cache 是否缓存
* @return \think\Model
*/
public static function get($data = '', $with = [], $cache = false)
public static function get($data = null, $with = [], $cache = false)
{
$query = self::parseQuery($data, $with, $cache);
$query = self::attachQuery($query);
@@ -106,7 +106,7 @@ class Merge extends Model
* @param string $with 关联预查询
* @return array|false|string
*/
public static function all($data = [], $with = [], $cache = false)
public static function all($data = null, $with = [], $cache = false)
{
$query = self::parseQuery($data, $with, $cache);
$query = self::attachQuery($query);
@@ -193,7 +193,7 @@ class Merge extends Model
unset($data[$pk]);
}
}
// 处理模型数据
$data = $this->parseData($this->name, $this->data);
// 写入主表数据