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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2017-12-28 17:24:35 +08:00
parent fba2b4b585 4ed42ca9ee
commit a7a71aa998
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
library/think/Model.php
View File

@@ -1070,12 +1070,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
}
if (is_string($pk) && isset($data[$pk])) {
if (!isset($where[$pk])) {
unset($where);
$where[$pk] = $data[$pk];
$array = [];
foreach ((array) $pk as $key) {
if (isset($data[$key])) {
$array[$key] = $data[$key];
unset($data[$key]);
}
unset($data[$pk]);
}
if (!empty($array)) {
$where = $array;
}
// 检测字段
@@ -1123,10 +1128,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
// 获取自动增长主键
if ($result && is_string($pk) && (!isset($this->data[$pk]) || '' == $this->data[$pk])) {
$insertId = $this->getQuery()->getLastInsID($sequence);
if ($insertId) {
$this->data[$pk] = $insertId;
if ($result && $insertId = $this->getQuery()->getLastInsID($sequence)) {
foreach ((array) $pk as $key) {
if (!isset($this->data[$key]) || '' == $this->data[$key]) {
$this->data[$key] = $insertId;
}
}
}