yingzi 2 年之前
父节点
当前提交
2b75a7e50c
共有 1 个文件被更改,包括 2 次插入2 次删除
  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['extend'])){
-                    $extends = json_decode($value['extend'], true);
+                    $extends = is_array($value['extend'])?$value['extend']:json_decode($value['extend'], true);
                 }else if(isset($value['extends'])){
-                    $extends = json_decode($value['extends'], true);
+                    $extends = is_array($value['extend'])?$value['extend']:json_decode($value['extends'], true);
                 }else{
                     $extends = [];
                 }