合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3156

@@ -53,7 +53,7 @@ class BaseController extends Controller
      */
     public function handleIdAndProjectId()
     {
-        if(isset($this->param['id']) && !empty($this->param['id'])){
+        if(isset($this->param['id']) && !empty($this->param['id']) &&  !is_array($this->param['id'])){
             if (preg_match('/^[A-Za-z]/', $this->param['id'])) {
                 $id = Cache::get('project_'.$this->param['id']);
                 if(empty($id)){

@@ -51,7 +51,7 @@ class BaseLogic extends Logic
      */
     public function handleIdAndProjectId($param)
     {
-        if(isset($param['id']) && !empty($param['id'])){
+        if(isset($param['id']) && !empty($param['id']) && !is_array($param['id'])){
             if (preg_match('/^[A-Za-z]/', $param['id'])) {
                 $id = Cache::get('project_'.$param['id']);
                 if(empty($id)){
@@ -64,7 +64,7 @@ class BaseLogic extends Logic
                 $param['id'] = $id;
             }
         }
-        if(isset($param['project_id']) && !empty($param['project_id'])){
+        if(isset($param['project_id']) && !empty($param['project_id']) && !is_array($param['project_id'])){
             if (preg_match('/^[A-Za-z]/', $param['project_id'])) {
                 $id = Cache::get('project_'.$param['project_id']);
                 if(empty($id)){