From 6723257a4ba0057b1786be4aea199bacdf128837 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 9 May 2016 10:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Query=E7=B1=BB=E7=9A=84find?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=80=E5=A4=84=E8=AD=A6=E5=91=8A=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 8e2a67cf..643a9d7d 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1409,7 +1409,7 @@ class Query
             if (!empty($options['model'])) {
                 // 返回模型对象
                 $data = new $options['model']($data);
-                $data->isUpdate(true, $options['where']['AND']);
+                $data->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null);
                 // 关联查询
                 if (!empty($options['relation'])) {
                     $data->relationQuery($options['relation']);