From 4aaf73bad70bb19bacbd50c7151c69abfb5a4c59 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Fri, 15 Oct 2021 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=BC=96=E8=BE=91=E5=88=97=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=97=B6=E5=BC=82=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 55965b5..9f547cc 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -309,13 +309,19 @@ namespace ZR.CodeGenerator
                 .Replace("{ModelName}", replaceDto.ModelTypeName)
                 .Replace("{Permission}", replaceDto.Permission)
                 .Replace("{PrimaryKey}", replaceDto.PKName)
-                .Replace("{UpdateColumn}", replaceDto.UpdateColumn.TrimEnd('\n'))
-                .Replace("{InsertColumn}", replaceDto.InsertColumn.TrimEnd('\n'))
                 .Replace("{ModuleName}", generateDto.GenTable.ModuleName)
                 .Replace("{PKCsharpType}", replaceDto.PKType)
                 .Replace("{Author}", replaceDto.Author)
                 .Replace("{DateTime}", replaceDto.AddTime);
 
+            if (replaceDto.UpdateColumn != null)
+            {
+                content = content.Replace("{UpdateColumn}", replaceDto.UpdateColumn.TrimEnd('\n'));
+            }
+            if (replaceDto.InsertColumn != null)
+            {
+                content = content.Replace("{InsertColumn}", replaceDto.InsertColumn.TrimEnd('\n'));
+            }
             generateDto.GenCodes.Add(new GenCode(5, "控制器", fullPath, content));
         }
         #endregion