From 6b5ceafcdf818c344569039cfaecb4cbf8c6bad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 10 Apr 2022 11:13:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/CodeGeneratorController.cs      | 10 ++++------
 ZR.Vue/src/views/tool/gen/editTable.vue                |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
index 09d397e..8d2768b 100644
--- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
@@ -160,14 +160,13 @@ namespace ZR.Admin.WebApi.Controllers
                 throw new CustomException("表不能为空");
             }
             string[] tableNames = tables.Split(',', StringSplitOptions.RemoveEmptyEntries);
-            string userName = User.Identity.Name;
-
+            int result = 0;
             foreach (var tableName in tableNames)
             {
                 var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName);
                 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);
 
                     if (genTable.TableId > 0)
@@ -179,13 +178,12 @@ namespace ZR.Admin.WebApi.Controllers
                         GenTableColumnService.DeleteGenTableColumnByTableName(tableName);
                         GenTableColumnService.InsertGenTableColumn(genTableColumns);
                         genTable.Columns = genTableColumns;
-
-                        return SUCCESS(genTable);
+                        result++;
                     }
                 }
             }
 
-            return ToResponse(ResultCode.FAIL, "生成失败");
+            return ToResponse(result);
         }
 
         /// <summary>
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 970dcdf..0ddc246 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -215,8 +215,8 @@ export default {
     },
     /** 关闭按钮 */
     close() {
-      this.$store.dispatch("tagsView/delView", this.$route);
-      this.$router.push({ path: "/tool/gen", query: { t: Date.now() } });
+			const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } };
+      this.$tab.closeOpenPage(obj);
     },
     /**
      * 排序保存