From 6cc0665237f648d8619fa29b6bb60c93042b749f Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 2 Jun 2017 14:20:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=9F=BA=E7=A1=80=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/controller/BasicAdmin.php | 3 +-- extend/controller/BasicApi.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extend/controller/BasicAdmin.php b/extend/controller/BasicAdmin.php index 55dac4eb0..83606a9b8 100644 --- a/extend/controller/BasicAdmin.php +++ b/extend/controller/BasicAdmin.php @@ -78,7 +78,7 @@ class BasicAdmin extends Controller { } } // GET请求, 获取并显示表单页面 - $vo = ($pkValue !== null) ? array_merge((array)$db->where($pk, $pkValue)->where($where)->find(), $data) : $data; + $vo = ($pkValue !== null) ? array_merge((array) $db->where($pk, $pkValue)->where($where)->find(), $data) : $data; if (false === $this->_callback('_form_filter', $vo)) { return $vo; } @@ -127,7 +127,6 @@ class BasicAdmin extends Controller { } !empty($this->title) && $this->assign('title', $this->title); return $this->fetch('', $result); - } /** diff --git a/extend/controller/BasicApi.php b/extend/controller/BasicApi.php index 3e8fc7df6..4712b2add 100644 --- a/extend/controller/BasicApi.php +++ b/extend/controller/BasicApi.php @@ -1,4 +1,5 @@