修正

2026-07-01 12:42:48 +08:00 · 2017-03-03 12:22:34 +08:00
parent ff7c860a62
commit f3c4cf2b25
1 changed files with 8 additions and 4 deletions
--- a/library/think/model/relation/BelongsToMany.php
+++ b/library/think/model/relation/BelongsToMany.php
@@ -370,10 +370,14 @@ class BelongsToMany extends Relation
        // 关联查询封装
        $tableName  = $this->query->getTable();
        $relationFk = $this->query->getPk();
-        return $this->query->field($tableName . '.*')
-            ->field(true, false, $table, 'pivot', 'pivot__')
-            ->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
-            ->where($condition);
+        $query      = $this->query->field($tableName . '.*')
+            ->field(true, false, $table, 'pivot', 'pivot__');
+
+        if (empty($this->baseQuery)) {
+            $query->join($table . ' pivot', 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
+                ->where($condition);
+        }
+        return $query;
    }

    /**