From fbb792eb2e8a31aecc95c8b00dd6c721844fcaa2 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 14 Jun 2016 10:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BBuilder=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Builder.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
index c3bdf253..67566972 100644
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -369,15 +369,13 @@ abstract class Builder
         // 获取时间字段类型
         $type = $this->query->getTableInfo('', 'type');
         if(isset($type[$key])){
+            $value = strtotime($value) ?: $value;
             if(preg_match('/(datetime|timestamp)/is', $type[$key])){
                 // 日期及时间戳类型
-                $value = date('Y-m-d H:i:s', strtotime($value));
+                $value = date('Y-m-d H:i:s', $value);
             }elseif(preg_match('/(date)/is', $type[$key])){
                 // 日期及时间戳类型
-                $value = date('Y-m-d', strtotime($value));
-            }else{
-                // 整型
-                $value = strtotime($value);
+                $value = date('Y-m-d', $value);
             }
         }
         return is_int($value)? $value : $this->connection->quote($value);