hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!371 修复CRUD关联模型时，自定义控制器生成的被关联表模型namespace错误 

Merge pull request !371 from simon429/develop
pull/304/MERGE
Karson 2021-11-18 01:54:50 +00:00 committed by Gitee
parent a7b7b772fd 48066342da
commit 093d60b719
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/admin/command/Crud.php
View File

@ -26,7 +26,7 @@ class Crud extends Command
* 受保护的系统表, crud不会生效 * 受保护的系统表, crud不会生效
*/ */
protected $systemTables = [ protected $systemTables = [
'admin', 'admin_log', 'auth_group', 'auth_group_access', 'auth_rule', 'admin', 'admin_log', 'auth_group', 'auth_group_access', 'auth_rule',
'attachment', 'config', 'category', 'ems', 'sms', 'attachment', 'config', 'category', 'ems', 'sms',
'user', 'user_group', 'user_rule', 'user_score_log', 'user_token', 'user', 'user_group', 'user_rule', 'user_score_log', 'user_token',
]; ];
@ -214,12 +214,12 @@ class Crud extends Command
$force = $input->getOption('force'); $force = $input->getOption('force');
//是否为本地model,为0时表示为全局model将会把model放在app/common/model中 //是否为本地model,为0时表示为全局model将会把model放在app/common/model中
$local = $input->getOption('local'); $local = $input->getOption('local');
if (!$table) { if (!$table) {
throw new Exception('table name can\'t empty'); throw new Exception('table name can\'t empty');
} }
//是否生成菜单 //是否生成菜单
$menu = $input->getOption("menu"); $menu = $input->getOption("menu");
//关联表 //关联表
@ -963,7 +963,7 @@ class Crud extends Command
if ($relations) { if ($relations) {
foreach ($relations as $i => $relation) { foreach ($relations as $i => $relation) {
$relation['modelNamespace'] = $data['modelNamespace']; $relation['modelNamespace'] = $relation['relationNamespace'];
if (!is_file($relation['relationFile'])) { if (!is_file($relation['relationFile'])) {
// 生成关联模型文件 // 生成关联模型文件
$this->writeToFile('relationmodel', $relation, $relation['relationFile']); $this->writeToFile('relationmodel', $relation, $relation['relationFile']);