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

Merge pull request #277 from sanyc/patch-3

Browse Source 
改进Relation类对非数字类型主键的支持
This commit is contained in:
ThinkPHP
2016-09-09 15:57:44 +08:00
committed by GitHub
parent 0201d4f19b cd9bf11172
commit a9ceded395
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/model/Relation.php
View File

@@ -602,7 +602,7 @@ class Relation
// 保存关联表数据 // 保存关联表数据
$model = new $this->model; $model = new $this->model;
$id = $model->save($data); $id = $model->save($data);
} elseif (is_numeric($data)) { } elseif (is_numeric($data) || is_string($data)) {
// 根据关联表主键直接写入中间表 // 根据关联表主键直接写入中间表
$id = $data; $id = $data;
} elseif ($data instanceof Model) { } elseif ($data instanceof Model) {
@@ -634,7 +634,7 @@ class Relation
{ {
if (is_array($data)) { if (is_array($data)) {
$id = $data; $id = $data;
} elseif (is_numeric($data)) { } elseif (is_numeric($data) || is_string($data)) {
// 根据关联表主键直接写入中间表 // 根据关联表主键直接写入中间表
$id = $data; $id = $data;
} elseif ($data instanceof Model) { } elseif ($data instanceof Model) {