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

改进

Browse Source
This commit is contained in:
thinkphp
2016-04-08 14:21:08 +08:00
parent 4f29fc0d65
commit 303a8c7169
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/Model.php
View File

@@ -312,7 +312,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return false; return false;
} }
// 数据自动完成 // 数据自动完成
$this->autoDataComplete($this->auto); $this->autoCompleteData($this->auto);
if ($this->isUpdate()) { if ($this->isUpdate()) {
// 更新数据 // 更新数据
@@ -320,7 +320,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return false; return false;
} }
// 自动更新 // 自动更新
$this->autoDataComplete($this->update); $this->autoCompleteData($this->update);
// 去除没有更新的字段 // 去除没有更新的字段
foreach ($this->data as $key => $val) { foreach ($this->data as $key => $val) {
@@ -344,7 +344,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} }
// 自动写入 // 自动写入
$this->autoDataComplete($this->insert); $this->autoCompleteData($this->insert);
$result = self::db()->insert($this->data); $result = self::db()->insert($this->data);
@@ -428,7 +428,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param array $auto 要自动更新的字段列表 * @param array $auto 要自动更新的字段列表
* @return void * @return void
*/ */
protected function autoDataComplete($auto = []) protected function autoCompleteData($auto = [])
{ {
foreach ($auto as $field) { foreach ($auto as $field) {
if (!in_array($field, $this->change)) { if (!in_array($field, $this->change)) {
@@ -551,7 +551,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function create($data = []) public static function create($data = [])
{ {
$model = new static(); $model = new static();
return $model->data($data)->save(); return $model->insert($data);
} }
/** /**
@@ -590,8 +590,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
public static function all($data = []) public static function all($data = [])
{ {
$resultSet = self::db()->select($data); return self::db()->select($data);
return $resultSet;
} }
/** /**
@@ -641,7 +640,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$foreignKey = $foreignKey ?: $this->pk; $foreignKey = $foreignKey ?: $this->pk;
$localKey = $localKey ?: Loader::parseName(basename(str_replace('\\', '/', $model))) . '_id'; $localKey = $localKey ?: Loader::parseName(basename(str_replace('\\', '/', $model))) . '_id';
$this->relation = self::BELONGS_TO; $this->relation = self::BELONGS_TO;
return $model::where($foreignKey, $this->data[$localKey]); return $model::where($foreignKey, $this->data[$localKey]);
} }