From 084431f0c60f6f0b4fd81ee8ac2a42f2c0b5affc Mon Sep 17 00:00:00 2001
From: oldrind <1401019000@qq.com>
Date: Wed, 13 Jan 2016 15:04:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=8D=E5=90=88=E5=80=BC?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F=20MODEL=5FBOTH=E7=9A=84=E5=80=BC3=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E6=98=AF1=E5=92=8C2=E7=9A=84=E5=A4=8D=E5=90=88=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E5=81=9A=E4=BD=8D?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/model/Auto.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/traits/model/Auto.php b/library/traits/model/Auto.php
index 73e64b98..3c0558c6 100644
--- a/library/traits/model/Auto.php
+++ b/library/traits/model/Auto.php
@@ -188,7 +188,7 @@ trait Auto
                 $flags = $flags | 1 << ($v - 1);
             }
         } else {
-            $flags = 1 << ($auto[2] - 1);
+            $flags = 3 == $auto[2] ? 3 : 1 << ($auto[2] - 1);
         }
         // 检查填充条件
         if ($flags & $type) {
@@ -304,11 +304,11 @@ trait Auto
             $flags = 1 << (self::MODEL_BOTH - 1);
         } elseif (is_array($val[5])) {
             $flags = 0;
-            foreach ($val[2] as $v) {
+            foreach ($val[5] as $v) {
                 $flags = $flags | 1 << ($v - 1);
             }
         } else {
-            $flags = 1 << ($val[5] - 1);
+            $flags = 3 == $val[5] ? 3 : 1 << ($val[5] - 1);
         }
         // 判断是否需要执行验证
         if ($flags & $type) {