yingzi 2 years ago
parent
commit
2b75a7e50c
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Model/MBaseModel.Class.php

+ 2 - 2
Model/MBaseModel.Class.php

@@ -296,9 +296,9 @@ class MBaseModel
             }
             }
             if((isset($value['extends']) && !empty($value['extends'])) || (isset($value['extend']) && !empty($value['extend']))){
             if((isset($value['extends']) && !empty($value['extends'])) || (isset($value['extend']) && !empty($value['extend']))){
                 if(isset($value['extend'])){
                 if(isset($value['extend'])){
-                    $extends = json_decode($value['extend'], true);
+                    $extends = is_array($value['extend'])?$value['extend']:json_decode($value['extend'], true);
                 }else if(isset($value['extends'])){
                 }else if(isset($value['extends'])){
-                    $extends = json_decode($value['extends'], true);
+                    $extends = is_array($value['extend'])?$value['extend']:json_decode($value['extends'], true);
                 }else{
                 }else{
                     $extends = [];
                     $extends = [];
                 }
                 }