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

修正unique验证规则

Browse Source
This commit is contained in:
thinkphp
2016-03-20 23:18:32 +08:00
parent 4f595f4e65
commit 7d0e423ffd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Validate.php
View File

@@ -543,22 +543,23 @@ class Validate
* @param mixed $value 字段值
* @param mixed $rule 验证规则 格式：数据表,字段名,排除ID
* @param array $data 数据
* @param string $field 验证字段名
* @return bool
*/
protected function unique($value, $rule, $data)
protected function unique($value, $rule, $data, $field)
{
$rule = explode(',', $rule);
$model = Loader::table($rule[0]);
$pk = $model->getPk();
$field = isset($rule[1]) ? $rule[1] : $key;
$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[$pk])) {
$except = $data[$pk];
} elseif (isset($data[$key])) {
$except = $data[$key];
}
$map[$field] = $value;
if (isset($except)) {
$map[$pk] = ['neq', $except];
$map[$key] = ['neq', $except];
}
if ($model->where($map)->find()) {
return false;