改名

2021-04-27 18:37:15 +08:00
parent 486d1f56cd
commit 6ff23d14e1
1 changed files with 5 additions and 5 deletions
@@ -305,16 +305,16 @@ class ActiveRecord extends BaseActiveRecord
 	 */
 	public function toArray(): array
 	{
-		return $this->_attributes;
+		$data = $this->_attributes;

 		$lists = $this->getAnnotation(self::GET);
 		foreach ($lists as $key => $item) {
-			$data[$key] = call_user_func([$this, $item], $data[$key] ?? null);
+			$data[$key] = call_user_func([$this,$item],$data[$key] ?? null);
 		}
-		return array_merge($data, $this->runRelate());
+		$data = array_merge($data, $this->runRelate());

-//		$class = Snowflake::app()->getChannel();
-//		$class->push($this, static::class);
+		$class = Snowflake::app()->getChannel();
+		$class->push($this, static::class);

 		return $data;
 	}