From be0161c480bccd1882eea032c5bf4d821424703c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 22 Jan 2021 16:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/ActiveRecord.php          | 3 +++
 Database/Base/BaseActiveRecord.php | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Database/ActiveRecord.php b/Database/ActiveRecord.php
index 7df4f62b..57fd9725 100644
--- a/Database/ActiveRecord.php
+++ b/Database/ActiveRecord.php
@@ -313,6 +313,9 @@ class ActiveRecord extends BaseActiveRecord
 	{
 		$data = $this->_attributes;
 		foreach ($this->getAnnotation() as $key => $item) {
+			if (!isset($data[$key])) {
+				continue;
+			}
 			$data[$key] = call_user_func($item, $data[$key]);
 		}
 		return array_merge($data, $this->runRelate());
diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php
index e3706e23..63c5d389 100644
--- a/Database/Base/BaseActiveRecord.php
+++ b/Database/Base/BaseActiveRecord.php
@@ -11,10 +11,10 @@ namespace Database\Base;
 
 
 use Annotation\Model\Get;
+use ArrayAccess;
 use HttpServer\Http\Context;
 use ReflectionException;
 use Snowflake\Abstracts\Component;
-use Snowflake\Core\Json;
 use Database\ActiveQuery;
 use Database\ActiveRecord;
 use Database\Connection;
@@ -22,7 +22,6 @@ use Database\HasMany;
 use Database\HasOne;
 use Database\Mysql\Columns;
 use Database\Relation;
-use Snowflake\Error\Logger;
 use Exception;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Exception\NotFindClassException;
@@ -39,7 +38,7 @@ use Snowflake\Snowflake;
  * @method rules()
  * @method static tableName()
  */
-abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess
+abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
 {
 
 	/** @var array */