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

改进Model类_write_data方法

Browse Source
This commit is contained in:
thinkphp
2016-02-25 20:24:52 +08:00
parent 5c8db926a6
commit b7c6c497ab
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Model.php
View File

@@ -204,7 +204,7 @@ class Model
throw new Exception('invalid data'); throw new Exception('invalid data');
} }
} }
if (!empty($this->duplicate)) { if (!empty($this->duplicate) && 'update' == $type) {
// 存在数据副本 // 存在数据副本
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
// 去除相同数据 // 去除相同数据
@@ -215,7 +215,7 @@ class Model
if (empty($data)) { if (empty($data)) {
// 没有数据变化 // 没有数据变化
return []; return [];
} elseif ('update' == $type) { } else {
// 更新操作保留主键信息 // 更新操作保留主键信息
$pk = $this->getPk(); $pk = $this->getPk();
if (is_array($pk)) { if (is_array($pk)) {
@@ -1225,7 +1225,7 @@ class Model
// 行为验证 // 行为验证
$result = Hook::exec($rule, '', $data); $result = Hook::exec($rule, '', $data);
break; break;
case 'filter': // 使用filter_var验证 case 'filter': // 使用filter_var验证
$result = filter_var($value, is_int($rule) ? $rule : filter_id($rule), $options); $result = filter_var($value, is_int($rule) ? $rule : filter_id($rule), $options);
break; break;
case 'confirm': case 'confirm':
@@ -1236,8 +1236,8 @@ class Model
$range = is_array($rule) ? $rule : explode(',', $rule); $range = is_array($rule) ? $rule : explode(',', $rule);
$result = 'in' == $type ? in_array($value, $range) : !in_array($value, $range); $result = 'in' == $type ? in_array($value, $range) : !in_array($value, $range);
break; break;
case 'between':// 验证是否在某个范围 case 'between': // 验证是否在某个范围
case 'notbetween': // 验证是否不在某个范围 case 'notbetween': // 验证是否不在某个范围
if (is_string($rule)) { if (is_string($rule)) {
$rule = explode(',', $rule); $rule = explode(',', $rule);
} }