From d087fe2852d1dcf0e8be93fabaf051d985d2452a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Fri, 7 May 2021 13:24:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=96=B0=E5=A2=9E=E6=97=B6=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BBID=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Entity/DEntityBase.cs                          | 2 +-
 Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Api/Ewide.Core/Entity/DEntityBase.cs b/Api/Ewide.Core/Entity/DEntityBase.cs
index ba8d4c9..5198f2d 100644
--- a/Api/Ewide.Core/Entity/DEntityBase.cs
+++ b/Api/Ewide.Core/Entity/DEntityBase.cs
@@ -19,7 +19,7 @@ namespace Ewide.Core
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
         [Comment("Id主键")]
         [Column("Id", TypeName = "varchar(36)")]
-        public virtual string Id { get; set; } = Guid.NewGuid().ToString();
+        public virtual string Id { get; set; }
 
         /// <summary>
         /// 创建时间
diff --git a/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs b/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs
index f877b59..36d0e1e 100644
--- a/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs
+++ b/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs
@@ -112,7 +112,7 @@ namespace Ewide.EntityFramework.Core
                     var obj = entity.Entity as DEntityBase;
                     if (entity.State == EntityState.Added)
                     {
-                        obj.Id = Guid.NewGuid().ToString();
+                        obj.Id = string.IsNullOrEmpty(obj.Id) ? Guid.NewGuid().ToString() : obj.Id;
                         obj.CreatedTime = DateTime.Now;
                         if (!string.IsNullOrEmpty(userId))
                         {