diff --git a/library/think/model/Relation.php b/library/think/model/Relation.php index 3d56091b..ed7e5603 100644 --- a/library/think/model/Relation.php +++ b/library/think/model/Relation.php @@ -91,7 +91,7 @@ abstract class Relation } /** - * 执行基础查询(进执行一次) + * 执行基础查询(仅执行一次) * @access protected * @return void */ diff --git a/library/think/model/relation/HasMany.php b/library/think/model/relation/HasMany.php index 364d793d..4c045494 100644 --- a/library/think/model/relation/HasMany.php +++ b/library/think/model/relation/HasMany.php @@ -183,7 +183,7 @@ class HasMany extends Relation * 保存(新增)当前关联数据对象 * @access public * @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键 - * @return integer + * @return Model|false */ public function save($data) { @@ -191,9 +191,9 @@ class HasMany extends Relation $data = $data->getData(); } // 保存关联表数据 - $data[$this->foreignKey] = $this->parent->{$this->localKey}; $model = new $this->model; - return $model->save($data); + $data[$this->foreignKey] = $this->parent->{$this->localKey}; + return $model->save($data) ? $model : false; } /** diff --git a/library/think/model/relation/MorphMany.php b/library/think/model/relation/MorphMany.php index 58e44135..964d3d3a 100644 --- a/library/think/model/relation/MorphMany.php +++ b/library/think/model/relation/MorphMany.php @@ -215,7 +215,7 @@ class MorphMany extends Relation * 保存(新增)当前关联数据对象 * @access public * @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键 - * @return integer + * @return Model|false */ public function save($data) { @@ -225,10 +225,10 @@ class MorphMany extends Relation // 保存关联表数据 $pk = $this->parent->getPk(); + $model = new $this->model; $data[$this->morphKey] = $this->parent->$pk; $data[$this->morphType] = $this->type; - $model = new $this->model; - return $model->save($data); + return $model->save($data) ? $model : false; } /** diff --git a/library/think/model/relation/OneToOne.php b/library/think/model/relation/OneToOne.php index 52575589..e2b37421 100644 --- a/library/think/model/relation/OneToOne.php +++ b/library/think/model/relation/OneToOne.php @@ -162,17 +162,17 @@ abstract class OneToOne extends Relation * 保存(新增)当前关联数据对象 * @access public * @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键 - * @return integer + * @return Model|false */ public function save($data) { if ($data instanceof Model) { $data = $data->getData(); } + $model = new $this->model; // 保存关联表数据 $data[$this->foreignKey] = $this->parent->{$this->localKey}; - $model = new $this->model; - return $model->save($data); + return $model->save($data) ? $model : false; } /**