diff --git a/ThinkPHP/Library/Think/Model/ViewModel.class.php b/ThinkPHP/Library/Think/Model/ViewModel.class.php index bfc494435313a836ab22ae2be976d489f677a055..94f2599f600a33f0465c538cb0b82bee9383ed4e 100644 --- a/ThinkPHP/Library/Think/Model/ViewModel.class.php +++ b/ThinkPHP/Library/Think/Model/ViewModel.class.php @@ -45,7 +45,7 @@ class ViewModel extends Model $prefix = $this->tablePrefix; $tableName = preg_replace_callback("/__([A-Z_-]+)__/sU", function ($match) use ($prefix) {return $prefix . strtolower($match[1]);}, $tableName); } else { - $class = $key . 'Model'; + $class = parse_res_name($key, C('DEFAULT_M_LAYER')); $Model = class_exists($class) ? new $class() : M($key); $tableName .= $Model->getTableName(); } @@ -102,7 +102,7 @@ class ViewModel extends Model private function _checkFields($name, $fields) { if (false !== $pos = array_search('*', $fields)) { -// 定义所有字段 + // 定义所有字段 $fields = array_merge($fields, M($name)->getDbFields()); unset($fields[$pos]); }