diff --git a/IoTSharp/Controllers/RulesController.cs b/IoTSharp/Controllers/RulesController.cs
index 151e1d5359df0f56fb9ab1afa11f744586beffb3..693f3dd68f9f52075e923f21456621ebd1f50583 100644
--- a/IoTSharp/Controllers/RulesController.cs
+++ b/IoTSharp/Controllers/RulesController.cs
@@ -1119,11 +1119,16 @@ namespace IoTSharp.Controllers
             {
                 await Task.Run(() =>
                 {
+
+                    var operevent =
+                        _context.BaseEvents.SingleOrDefault(
+                            c => c.EventId == result.FirstOrDefault().BaseEvent.EventId);
+
                     var list = result.Select(c => new FlowOperation
                     {
                         AddDate = c.AddDate,
                         BizId = c.BizId,
-                        Data = c.Data,
+                        Data = c.Data, BaseEvent = operevent,
                         Flow = flows.SingleOrDefault(x=>x.FlowId==c.Flow.FlowId
                         ),
                         FlowRule = flowRule,
diff --git a/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs b/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
index 5a881f902ea84ba310e6eb661f0dfbf0ec8d80dc..9de1b3ee4b2429eb478b522be37e576f3b6cfb3d 100644
--- a/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
+++ b/IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
@@ -90,10 +90,12 @@ namespace IoTSharp.FlowRuleEngine
                 {
                     using (var context = sp.ServiceProvider.GetRequiredService<ApplicationDbContext>())
                     {
-                        var r = context.FlowRules.FirstOrDefault(c => c.RuleId == rule.RuleId);
+                        var r = context.FlowRules.Include(c=>c.Customer).Include(c=>c.Tenant).FirstOrDefault(c => c.RuleId == rule.RuleId);
                         if (r != null)
                         {
                             @event.FlowRule = r;
+                            @event.Tenant = r.Tenant;
+                            @event.Customer = r.Customer;
                             context.BaseEvents.Add(@event);
                             context.SaveChanges();
                         }