wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix代码生成导入表问题

Browse Source
This commit is contained in:
不做码农 2022-04-10 11:13:29 +08:00
parent 75bcc57608
commit 6b5ceafcdf
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -160,14 +160,13 @@ namespace ZR.Admin.WebApi.Controllers
throw new CustomException("表不能为空"); throw new CustomException("表不能为空");
} }
string[] tableNames = tables.Split(',', StringSplitOptions.RemoveEmptyEntries); string[] tableNames = tables.Split(',', StringSplitOptions.RemoveEmptyEntries);
string userName = User.Identity.Name; int result = 0;
foreach (var tableName in tableNames) foreach (var tableName in tableNames)
{ {
var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName); var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName);
if (tabInfo != null) if (tabInfo != null)
{ {
GenTable genTable = CodeGeneratorTool.InitTable(dbName, userName, tableName, tabInfo?.Description); GenTable genTable = CodeGeneratorTool.InitTable(dbName, HttpContext.GetName(), tableName, tabInfo?.Description);
genTable.TableId = GenTableService.ImportGenTable(genTable); genTable.TableId = GenTableService.ImportGenTable(genTable);
if (genTable.TableId > 0) if (genTable.TableId > 0)
@ -179,13 +178,12 @@ namespace ZR.Admin.WebApi.Controllers
GenTableColumnService.DeleteGenTableColumnByTableName(tableName); GenTableColumnService.DeleteGenTableColumnByTableName(tableName);
GenTableColumnService.InsertGenTableColumn(genTableColumns); GenTableColumnService.InsertGenTableColumn(genTableColumns);
genTable.Columns = genTableColumns; genTable.Columns = genTableColumns;
result++;
return SUCCESS(genTable);
} }
} }
} }
return ToResponse(ResultCode.FAIL, "生成失败"); return ToResponse(result);
} }
/// <summary> /// <summary>

4
ZR.Vue/src/views/tool/gen/editTable.vue
View File

@ -215,8 +215,8 @@ export default {
}, },
/** 关闭按钮 */ /** 关闭按钮 */
close() { close() {
this.$store.dispatch("tagsView/delView", this.$route); const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } };
this.$router.push({ path: "/tool/gen", query: { t: Date.now() } }); this.$tab.closeOpenPage(obj);
}, },
/** /**
* 排序保存 * 排序保存