diff --git a/library/think/Model.php b/library/think/Model.php index fa6ed492..f1c91582 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -326,6 +326,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $value = date($format, $_SERVER['REQUEST_TIME']); break; case 'timestamp': + case 'int': $value = $_SERVER['REQUEST_TIME']; break; } diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php index 77175c82..a18332a2 100644 --- a/library/think/db/Builder.php +++ b/library/think/db/Builder.php @@ -297,7 +297,7 @@ abstract class Builder } } $bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR; - if (is_scalar($value) && array_key_exists($field, $binds) && !in_array($exp, ['IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) { + if (is_scalar($value) && array_key_exists($field, $binds) && !in_array($exp, ['NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) { if (strpos($value, ':') !== 0 || !$this->query->isBind(substr($value, 1))) { $bindName = $bindName ?: 'where_' . $field; $this->query->bind($bindName, $value, $bindType);