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

修正Merge模型

Browse Source
This commit is contained in:
thinkphp
2016-05-17 17:01:04 +08:00
parent 2072a395a6
commit 5a01b29c30
2 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ class Merge extends Model
foreach (static::$relationModel as $key => $model) {
$name = is_int($key) ? $model : $key;
$table = is_int($key) ? self::db()->name($name)->getTable() : $model;
$table = is_int($key) ? self::db()->getTable($name) : $model;
$query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk());
$fields = self::getModelField($name, $table, $class->mapFields);
$query->field($fields);
@@ -182,10 +182,11 @@ class Merge extends Model
// 写入附表数据
foreach (static::$relationModel as $key => $model) {
$name = is_int($key) ? $model : $key;
$table = is_int($key) ? self::db()->name($model)->getTable() : $model;
$table = is_int($key) ? self::db()->getTable($model) : $model;
// 处理关联模型数据
$data = $this->parseData($name, $this->data);
self::db()->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data);
$data = $this->parseData($name, $this->data);
$query = clone self::db();
$query->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data);
}
// 新增回调
$this->trigger('after_update', $this);
@@ -207,10 +208,11 @@ class Merge extends Model
// 写入附表数据
foreach (static::$relationModel as $key => $model) {
$name = is_int($key) ? $model : $key;
$table = is_int($key) ? self::db()->name($model)->getTable() : $model;
$table = is_int($key) ? self::db()->getTable($model) : $model;
// 处理关联模型数据
$data = $this->parseData($name, $this->data, true);
self::db()->table($table)->strict(false)->insert($data);
$data = $this->parseData($name, $this->data, true);
$query = clone self::db();
$query->table($table)->strict(false)->insert($data);
}
$result = $insertId;
}
@@ -244,8 +246,9 @@ class Merge extends Model
// 删除关联数据
foreach (static::$relationModel as $key => $model) {
$table = is_int($key) ? self::db()->name($model)->getTable() : $model;
self::db()->table($table)->where($this->fk, $pk)->delete();
$table = is_int($key) ? self::db()->getTable($model) : $model;
$query = clone self::db();
$query->table($table)->where($this->fk, $pk)->delete();
}
}
$this->trigger('after_delete', $this);