diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php index 9ef94a70..0a1b98ac 100644 --- a/library/think/model/Merge.php +++ b/library/think/model/Merge.php @@ -67,7 +67,7 @@ class Merge extends Model foreach (static::$relationModel as $key => $model) { $name = is_int($key) ? $model : $key; $table = is_int($key) ? self::db()->name($name)->getTable() : $model; - $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->pk); + $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk()); $fields = self::getModelField($name, $table, $class->mapFields); $query->field($fields); }