mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进hasWhere查询的数据重复问题

Browse Source
This commit is contained in:
thinkphp
2017-11-24 17:22:58 +08:00
parent b69e64a521
commit 5706ed7e44
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/think/model/relation/BelongsTo.php
View File

@@ -97,6 +97,7 @@ class BelongsTo extends OneToOne
} }
return $this->parent->db()->alias($model) return $this->parent->db()->alias($model)
->field($model . '.*') ->field($model . '.*')
->group($model . '.' . $this->foreignKey)
->join($table . ' ' . $relation, $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType) ->join($table . ' ' . $relation, $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType)
->where($where); ->where($where);
} }

1
library/think/model/relation/HasMany.php
View File

@@ -271,6 +271,7 @@ class HasMany extends Relation
} }
return $this->parent->db()->alias($model) return $this->parent->db()->alias($model)
->field($model . '.*') ->field($model . '.*')
->group($model . '.' . $this->localKey)
->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey) ->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
->where($where); ->where($where);
} }