From b7c6c497abf3b87c52af31c131071840ccc09c09 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 25 Feb 2016 20:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BModel=E7=B1=BB=5Fwrite=5Fdata?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/think/Model.php b/library/think/Model.php index 732bf466..e3439301 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -204,7 +204,7 @@ class Model throw new Exception('invalid data'); } } - if (!empty($this->duplicate)) { + if (!empty($this->duplicate) && 'update' == $type) { // 存在数据副本 foreach ($data as $key => $val) { // 去除相同数据 @@ -215,7 +215,7 @@ class Model if (empty($data)) { // 没有数据变化 return []; - } elseif ('update' == $type) { + } else { // 更新操作保留主键信息 $pk = $this->getPk(); if (is_array($pk)) { @@ -1225,7 +1225,7 @@ class Model // 行为验证 $result = Hook::exec($rule, '', $data); break; - case 'filter': // 使用filter_var验证 + case 'filter': // 使用filter_var验证 $result = filter_var($value, is_int($rule) ? $rule : filter_id($rule), $options); break; case 'confirm': @@ -1236,8 +1236,8 @@ class Model $range = is_array($rule) ? $rule : explode(',', $rule); $result = 'in' == $type ? in_array($value, $range) : !in_array($value, $range); break; - case 'between':// 验证是否在某个范围 - case 'notbetween': // 验证是否不在某个范围 + case 'between': // 验证是否在某个范围 + case 'notbetween': // 验证是否不在某个范围 if (is_string($rule)) { $rule = explode(',', $rule); }