From 1647f78196cf5d49386715765ea8a38479ca36af 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: Wed, 29 Dec 2021 18:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/CodeGeneratorController.cs   | 13 ++++++++-----
 .../wwwroot/CodeGenTemplate/TplService.txt          |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
index dd620f2..0a4ccb7 100644
--- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
@@ -196,6 +196,10 @@ namespace ZR.Admin.WebApi.Controllers
         public IActionResult EditSave([FromBody] GenTableDto genTableDto)
         {
             if (genTableDto == null) throw new CustomException("请求参数错误");
+            if (genTableDto.BusinessName.Equals(genTableDto.ModuleName, StringComparison.OrdinalIgnoreCase))
+            {
+                return ToResponse(ResultCode.CUSTOM_ERROR, "模块名不能和业务名一样");
+            }
             var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
 
             genTable.Options = JsonConvert.SerializeObject(new
@@ -204,17 +208,16 @@ namespace ZR.Admin.WebApi.Controllers
                 sortField = genTableDto.SortField,
                 sortType = genTable.SortType
             });
-            int updateCount = 0;
-            bool result = GenTableService.UseTran2(() =>
+            DbResult<bool> result = GenTableService.UseTran(() =>
             {
                 int rows = GenTableService.UpdateGenTable(genTable);
                 if (rows > 0)
                 {
-                    updateCount = GenTableColumnService.UpdateGenTableColumn(genTable.Columns);
+                    GenTableColumnService.UpdateGenTableColumn(genTable.Columns);
                 }
             });
-
-            return SUCCESS(updateCount);
+            
+            return SUCCESS(result.IsSuccess);
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index 92528e3..ebda1a5 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -52,9 +52,9 @@ $end
 $end
 $end
 $if(genTable.SortField != "" && genTable.SortField != null)
-            var response = Queryable().GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}");
+            var response = _${replaceDto.ModelTypeName}repository.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}");
 $else
-            var response = Queryable().Where(predicate.ToExpression()).ToPage(parm);
+            var response = _${replaceDto.ModelTypeName}repository.Where(predicate.ToExpression()).ToPage(parm);
 $end
             return response;
         }