变更

2023-04-01 01:27:57 +08:00
parent 98fff7302e
commit e2f94c9202
2 changed files with 17 additions and 11 deletions
@@ -265,8 +265,8 @@ class Model extends Base\Model
 	public function toArray(): array
 	{
 		$data = $this->_attributes;
-		$keys = Kiri::getDi()->get(Getter::class);
-		foreach ($keys->getAll(static::class) as $key => $datum) {
+		$keys = Kiri::getDi()->get(Getter::class)->getAll(static::class);
+		foreach ($keys as $key => $datum) {
 			$data[$key] = $this->{$datum}($data[$key]);
 		}
 		return $this->withRelates($data);
@@ -279,10 +279,10 @@ class Model extends Base\Model
 	 */
 	private function withRelates($relates): array
 	{
-		if (empty($with = $this->getWith())) {
+		if (!$this->hasWith()) {
 			return $relates;
 		}
-		foreach ($with as $val) {
+		foreach ($this->getWith() as $val) {
 			$relates[$val] = $this->withRelate($val);
 		}
 		return $relates;