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

改进Route类

Browse Source
This commit is contained in:
thinkphp
2016-09-09 20:37:00 +08:00
parent 8b55500f91
commit 766c410fe4
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/think/Route.php
View File

@@ -1336,22 +1336,31 @@ class Route
$bind = []; $bind = [];
foreach ($option['bind_model'] as $key => $val) { foreach ($option['bind_model'] as $key => $val) {
if ($val instanceof \Closure) { if ($val instanceof \Closure) {
$bind[$key] = call_user_func_array($val, [$matches]); $result = call_user_func_array($val, [$matches]);
} else { } else {
if (is_array($val)) { if (is_array($val)) {
parse_str($val[1], $fields); $fields = explode('&', $val[1]);
$model = $val[0]; $model = $val[0];
} else { } else {
$fields = ['id']; $fields = ['id'];
$model = $val; $model = $val;
} }
$where = []; $where = [];
$match = true;
foreach ($fields as $field) { foreach ($fields as $field) {
if (isset($matches[$field])) { if (!isset($matches[$field])) {
$match = false;
break;
} else {
$where[$field] = $matches[$field]; $where[$field] = $matches[$field];
} }
} }
$bind[$key] = $model::where($where)->find(); if ($match) {
$result = $model::where($where)->findOrFail();
}
}
if (!empty($result)) {
$bind[$key] = $result;
} }
} }
$matches = array_merge($matches, $bind); $matches = array_merge($matches, $bind);