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

改进unique验证规则的复合主键导致的错误 复合主键的情况直接使用条件判断表达式

Browse Source
This commit is contained in:
thinkphp
2016-03-21 16:55:24 +08:00
parent ebe350e35f
commit 4d01abcb29
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/Validate.php
View File

@@ -523,7 +523,7 @@ class Validate
* 验证是否唯一
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则 格式：数据表,字段名,排除ID
* @param mixed $rule 验证规则 格式：数据表,字段名,排除ID,主键名
* @param array $data 数据
* @param string $field 验证字段名
* @return bool
@@ -534,13 +534,7 @@ class Validate
$rule = explode(',', $rule);
}
$model = Loader::table($rule[0]);
$key = isset($rule[3]) ? $rule[3] : $model->getPk();
$field = isset($rule[1]) ? $rule[1] : $field;
if (isset($rule[2])) {
$except = $rule[2];
} elseif (isset($data[$key])) {
$except = $data[$key];
}
if (strpos($field, '|')) {
// 支持多个字段验证
@@ -554,9 +548,13 @@ class Validate
$map[$field] = $data[$field];
}
if (isset($except)) {
$map[$key] = ['neq', $except];
$key = strval(isset($rule[3]) ? $rule[3] : $model->getPk());
if (isset($rule[2])) {
$map[$key] = ['neq', $rule[2]];
} elseif (isset($data[$key])) {
$map[$key] = ['neq', $data[$key]];
}
if ($model->where($map)->field($key)->find()) {
return false;
}