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

修正Model类的add和save方法

Browse Source
This commit is contained in:
thinkphp
2016-02-04 11:51:01 +08:00
parent 4d7eb0b8a0
commit a7222baf9b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Model.php
View File

@@ -285,7 +285,7 @@ class Model
// 写入数据到数据库 // 写入数据到数据库
$result = $this->db->insert($data, $options, $replace); $result = $this->db->insert($data, $options, $replace);
if (false !== $result && is_numeric($result)) { if (false !== $result && is_numeric($result)) {
$pk = $this->getPk(); $pk = $this->getPk($options['table']);
// 增加复合主键支持 // 增加复合主键支持
if (is_array($pk)) { if (is_array($pk)) {
return $result; return $result;
@@ -340,7 +340,7 @@ class Model
$data = $this->_write_data($data, 'update'); $data = $this->_write_data($data, 'update');
// 分析表达式 // 分析表达式
$options = $this->_parseOptions(); $options = $this->_parseOptions();
$pk = $this->getPk(); $pk = $this->getPk($options['table']);
if (!isset($options['where'])) { if (!isset($options['where'])) {
// 如果存在主键数据 则自动作为更新条件 // 如果存在主键数据 则自动作为更新条件
if (is_string($pk) && isset($data[$pk])) { if (is_string($pk) && isset($data[$pk])) {
@@ -914,7 +914,8 @@ class Model
} }
// 状态 // 状态
$type = $type ? $type : (!empty($data[$this->getPk()]) ? self::MODEL_UPDATE : self::MODEL_INSERT); $pk = $this->getPk();
$type = $type ? $type : (is_string($pk) && !empty($data[$pk]) ? self::MODEL_UPDATE : self::MODEL_INSERT);
// 检测提交字段的合法性 // 检测提交字段的合法性
if (isset($this->options['field'])) { if (isset($this->options['field'])) {