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

修正聚合模型

Browse Source
This commit is contained in:
thinkphp
2016-12-21 11:09:45 +08:00
parent 55ca76ccae
commit c1107d3a85
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
namespace think\model; namespace think\model;
use think\Db; use think\Db;
use think\db\Query;
use think\Model; use think\Model;
class Merge extends Model class Merge extends Model
@@ -174,6 +175,7 @@ class Merge extends Model
$db = $this->db(); $db = $this->db();
$db->startTrans(); $db->startTrans();
$pk = $this->getPk();
try { try {
if ($this->isUpdate) { if ($this->isUpdate) {
// 自动写入 // 自动写入
@@ -187,19 +189,15 @@ class Merge extends Model
$where = $this->updateWhere; $where = $this->updateWhere;
} }
if (!empty($where)) {
$pk = $this->getPk();
if (isset($this->mapFields[$pk])) {
$pk = $this->mapFields[$pk];
}
if (isset($where[$pk])) {
unset($where[$pk]);
}
}
// 处理模型数据 // 处理模型数据
$data = $this->parseData($this->name, $this->data); $data = $this->parseData($this->name, $this->data);
if (is_string($pk) && isset($data[$pk])) {
if (!isset($where[$pk])) {
unset($where);
$where[$pk] = $data[$pk];
}
unset($data[$pk]);
}
// 写入主表数据 // 写入主表数据
$result = $db->strict(false)->where($where)->update($data); $result = $db->strict(false)->where($where)->update($data);
@@ -209,7 +207,7 @@ class Merge extends Model
$table = is_int($key) ? $db->getTable($model) : $model; $table = is_int($key) ? $db->getTable($model) : $model;
// 处理关联模型数据 // 处理关联模型数据
$data = $this->parseData($name, $this->data); $data = $this->parseData($name, $this->data);
$query = clone $db; $query = new Query;
if ($query->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data)) { if ($query->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data)) {
$result = 1; $result = 1;
} }
@@ -238,7 +236,6 @@ class Merge extends Model
if ($result) { if ($result) {
$insertId = $db->getLastInsID($sequence); $insertId = $db->getLastInsID($sequence);
// 写入外键数据 // 写入外键数据
$pk = $this->getPk();
if ($insertId) { if ($insertId) {
if (is_string($pk)) { if (is_string($pk)) {
$this->data[$pk] = $insertId; $this->data[$pk] = $insertId;
@@ -259,7 +256,7 @@ class Merge extends Model
$table = is_int($key) ? $db->getTable($model) : $model; $table = is_int($key) ? $db->getTable($model) : $model;
// 处理关联模型数据 // 处理关联模型数据
$data = $this->parseData($name, $source, true); $data = $this->parseData($name, $source, true);
$query = clone $db; $query = new Query;
$query->table($table)->strict(false)->insert($data); $query->table($table)->strict(false)->insert($data);
} }
} }