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

修正Model类的saveall方法的验证

Browse Source
This commit is contained in:
thinkphp
2016-11-02 19:09:48 +08:00
parent e3db097287
commit 82a8c2170a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Model.php
View File

@@ -741,7 +741,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 数据批量验证 // 数据批量验证
$validate = $this->validate; $validate = $this->validate;
foreach ($dataSet as $data) { foreach ($dataSet as $data) {
if (!$this->validate($validate)->validateData($data)) { if (!$this->validateData($data, $validate)) {
return false; return false;
} }
} }
@@ -885,12 +885,13 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* 自动验证数据 * 自动验证数据
* @access protected * @access protected
* @param array $data 验证数据 * @param array $data 验证数据
* @param mixed $rule 验证规则
* @return bool * @return bool
*/ */
protected function validateData($data) protected function validateData($data, $rule = null)
{ {
if (!empty($this->validate)) { $info = is_null($rule) ? $this->validate : $rule;
$info = $this->validate; if (!empty($info)) {
if (is_array($info)) { if (is_array($info)) {
$validate = Loader::validate(); $validate = Loader::validate();
$validate->rule($info['rule']); $validate->rule($info['rule']);