修改实体类

src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs

@@ -59,19 +59,19 @@ namespace HuanMeng.DotNetCore.MultiTenant
         {
             if (TenantInfo?.TenantId != null)
             {
-                //var entries = ChangeTracker.Entries()
+                var entries = ChangeTracker.Entries()
-                //.Where(e => e.Entity is IMultiTenantEntity &&
+                .Where(e => e.Entity is IMultiTenantEntity &&
-                //            (e.State == EntityState.Added || e.State == EntityState.Modified))
+                            (e.State == EntityState.Added || e.State == EntityState.Modified))
-                //.Select(e => e.Entity as IMultiTenantEntity)
+                .Select(e => e.Entity as IMultiTenantEntity)
-                //.ToList();
+                .ToList();
 
-                //foreach (var entity in entries)
+                foreach (var entity in entries)
-                //{
+                {
-                //    if (entity?.TenantId == null)
+                    if (entity?.TenantId == null || entity?.TenantId == Guid.Empty)
-                //    {
+                    {
-                //        entity.TenantId = TenantInfo.TenantId;
+                        entity.TenantId = TenantInfo.TenantId;
-                //    }
+                    }
-                //}
+                }
             }
             return base.SaveChanges();
         }

src/0-core/HuanMeng.MiaoYu.Code/Chat/ChatBLL.cs

@@ -78,7 +78,6 @@ namespace HuanMeng.MiaoYu.Code.Chat
                 list.Add(chat);
                 return new BaseResponse<List<ChatMessageDto>>(ResonseCode.Success, "", list);
             }
-            //if(timeStamp.)
             var userChatSession = await Dao.daoDbMiaoYu.context.T_User_Chat.Where(it => it.CharacterId == characterId && it.UserId == _UserId && !it.IsDelete).FirstOrDefaultAsync();
             if (userChatSession == null)
             {

src/0-core/HuanMeng.MiaoYu.Code/Users/UserAccount/PhoneAccount/PhoneAccountLogin.cs

@@ -81,7 +81,7 @@ namespace HuanMeng.MiaoYu.Code.Users.UserAccount.PhoneAccount
                 Key = phone,
                 Remarks = "登录验证码",
                 VerificationType = 0,
-                TenantId = dao.daoDbMiaoYu.context?.TenantInfo?.TenantId ?? Guid.Empty,
+               // TenantId = dao.daoDbMiaoYu.context?.TenantInfo?.TenantId ?? Guid.Empty,
             };
             dao.daoDbMiaoYu.Add(t_Verification_Code);
             dao.daoDbMiaoYu.context.SaveChanges();

src/0-core/HuanMeng.MiaoYu.Model/CodeTemplates/EFCore/EntityType.t4

@@ -77,10 +77,7 @@ public partial class <#= EntityType.Name #>: MultiTenantEntity
 
         if(property.Name=="TenantId"){
         #>
-         /// <summary>
+    public override Guid TenantId { get; set; }
-         /// <#= code.XmlComment(property.GetComment(), indent: 1) #>
-         /// </summary>
-         public override Guid TenantId { get; set; }
          <#
             continue;
         }

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Category_Child_Menu.cs

@@ -53,4 +53,5 @@ public partial class T_Category_Child_Menu: MultiTenantEntity
     /// </summary>
     public string? SubTitle { get; set; }
 
-}
+    public override Guid TenantId { get; set; }
+         }

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu;
 
@@ -7,10 +7,6 @@ namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu;
 /// </summary>
 public partial class T_Character: MultiTenantEntity
 {
-    /// <summary>
-    /// 租户
-    /// </summary>
-    public override Guid TenantId { get; set; }
     /// <summary>
     /// 人物id
     /// </summary>
@@ -26,6 +22,7 @@ public partial class T_Character: MultiTenantEntity
     /// </summary>
     public string? Biography { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 开场白，剧情

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Label.cs

@@ -12,6 +12,7 @@ public partial class T_Character_Label: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 标签名称

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Label_Relation.cs

@@ -12,6 +12,7 @@ public partial class T_Character_Label_Relation: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 人物Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Personality.cs

@@ -12,6 +12,7 @@ public partial class T_Character_Personality: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 性格名称

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Personality_Relation.cs

@@ -12,6 +12,7 @@ public partial class T_Character_Personality_Relation: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 性格Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Type.cs

@@ -27,6 +27,7 @@ public partial class T_Character_Type: MultiTenantEntity
     /// </summary>
     public DateTime UpdateTime { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 分类页不显示

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Type_Intimacy.cs

@@ -12,6 +12,7 @@ public partial class T_Character_Type_Intimacy: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 列表Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_User_Intimacy.cs

@@ -12,6 +12,7 @@ public partial class T_Character_User_Intimacy: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 人物Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Chat.cs

@@ -12,6 +12,7 @@ public partial class T_Chat: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 聊天内容

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_CoinPrices_Config.cs

@@ -12,6 +12,7 @@ public partial class T_CoinPrices_Config: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 金币数量

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Image_Config.cs

@@ -9,6 +9,7 @@ public partial class T_Image_Config: MultiTenantEntity
 {
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 图片Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Model_Config.cs

@@ -49,6 +49,7 @@ public partial class T_Model_Config: MultiTenantEntity
     /// </summary>
     public DateTime UpdateTime { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// system上下文模板

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Orders.cs

@@ -12,6 +12,7 @@ public partial class T_Orders: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 用户id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_ShoppingMall.cs

@@ -42,6 +42,7 @@ public partial class T_ShoppingMall: MultiTenantEntity
     /// </summary>
     public DateTime? UpdateTime { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 商品上架时间

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_TransactionRecord.cs

@@ -52,4 +52,5 @@ public partial class T_TransactionRecord: MultiTenantEntity
     /// </summary>
     public DateTime? UpdateTime { get; set; }
 
-}
+    public override Guid TenantId { get; set; }
+         }

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User.cs

@@ -12,6 +12,7 @@ public partial class T_User: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 用户昵称

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Chat.cs

@@ -29,6 +29,7 @@ public partial class T_User_Chat: MultiTenantEntity
     /// </summary>
     public int ModelConfigId { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 用户Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Currency.cs

@@ -39,4 +39,5 @@ public partial class T_User_Currency: MultiTenantEntity
     /// </summary>
     public int UserId { get; set; }
 
-}
+    public override Guid TenantId { get; set; }
+         }

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Currency_Log.cs

@@ -9,6 +9,7 @@ public partial class T_User_Currency_Log: MultiTenantEntity
 {
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 用户

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Data.cs

@@ -17,6 +17,7 @@ public partial class T_User_Data: MultiTenantEntity
     /// </summary>
     public int UserId { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 用户昵称，需要和主表保持一致

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_MemoryCard.cs

@@ -9,6 +9,7 @@ public partial class T_User_MemoryCard: MultiTenantEntity
 {
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 记忆卡名称

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Phone_Account.cs

@@ -12,6 +12,7 @@ public partial class T_User_Phone_Account: MultiTenantEntity
     /// </summary>
     public int Id { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 用户Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Prop.cs

@@ -17,6 +17,7 @@ public partial class T_User_Prop: MultiTenantEntity
     /// </summary>
     public int UserId { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 道具Id

src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Verification_Code.cs

@@ -42,6 +42,7 @@ public partial class T_Verification_Code: MultiTenantEntity
     /// </summary>
     public string? Remarks { get; set; }
 
+    public override Guid TenantId { get; set; }
          
     /// <summary>
     /// 0手机，1邮箱