From 328a12eae51aeec70b26348ae58e424d0b506ab0 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 30 Sep 2016 18:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=A8=A1=E5=9E=8B=E7=9A=84re?=
 =?UTF-8?q?lationModel=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/Merge.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index c0a6f21c..c28d0fd7 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -17,9 +17,9 @@ use think\Model;
 class Merge extends Model
 {
 
-    protected static $relationModel = []; // HAS ONE 关联的模型列表
-    protected $fk                   = ''; //  外键名 默认为主表名_id
-    protected $mapFields            = []; //  需要处理的模型映射字段，避免混淆 array( id => 'user.id'  )
+    protected $relationModel = []; // HAS ONE 关联的模型列表
+    protected $fk            = ''; //  外键名 默认为主表名_id
+    protected $mapFields     = []; //  需要处理的模型映射字段，避免混淆 array( id => 'user.id'  )
 
     /**
      * 架构函数
@@ -64,7 +64,7 @@ class Merge extends Model
         $fields = self::getModelField($query, $master, '', $class->mapFields);
         $query->alias($master)->field($fields);
 
-        foreach (static::$relationModel as $key => $model) {
+        foreach ($class->relationModel as $key => $model) {
             $name  = is_int($key) ? $model : $key;
             $table = is_int($key) ? $query->getTable($name) : $model;
             $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk());
@@ -203,7 +203,7 @@ class Merge extends Model
                 $result = $db->strict(false)->where($where)->update($data);
 
                 // 写入附表数据
-                foreach (static::$relationModel as $key => $model) {
+                foreach ($this->relationModel as $key => $model) {
                     $name  = is_int($key) ? $model : $key;
                     $table = is_int($key) ? $db->getTable($model) : $model;
                     // 处理关联模型数据
@@ -253,7 +253,7 @@ class Merge extends Model
                     if ($insertId && is_string($pk) && isset($source[$pk]) && $this->fk != $pk) {
                         unset($source[$pk]);
                     }
-                    foreach (static::$relationModel as $key => $model) {
+                    foreach ($this->relationModel as $key => $model) {
                         $name  = is_int($key) ? $model : $key;
                         $table = is_int($key) ? $db->getTable($model) : $model;
                         // 处理关联模型数据
@@ -297,7 +297,7 @@ class Merge extends Model
                 $pk = $this->data[$this->getPk()];
 
                 // 删除关联数据
-                foreach (static::$relationModel as $key => $model) {
+                foreach ($this->relationModel as $key => $model) {
                     $table = is_int($key) ? $db->getTable($model) : $model;
                     $query = clone $db;
                     $query->table($table)->where($this->fk, $pk)->delete();