Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/PushMessageController.cs

@@ -70,15 +70,13 @@ namespace Hotline.Api.Controllers
         {
             var (total, items) = await _messageRepository
                 .Queryable()
-                .Includes(it => it.User)
-                .Includes(it => it.SystemOrganize)
                 .Includes(it => it.Order)
                 .WhereIF(pagedDto.PushBusiness.HasValue, d => d.PushBusiness == pagedDto.PushBusiness)
                 .WhereIF(pagedDto.Status.HasValue, d => d.SendState == pagedDto.Status)
                 .WhereIF(!string.IsNullOrEmpty(pagedDto.Keyword),
                     d => d.Name.Contains(pagedDto.Keyword!) || d.Content.Contains(pagedDto.Keyword!) ||
-                         d.TelNumber.Contains(pagedDto.Keyword!) || d.User.Name.Contains(pagedDto.Keyword!) ||
-                         d.SystemOrganize.Name.Contains(pagedDto.Keyword!))
+                         d.TelNumber.Contains(pagedDto.Keyword!) || d.CreatorName.Contains(pagedDto.Keyword!) ||
+                         d.CreatorOrgName.Contains(pagedDto.Keyword!))
                 .WhereIF(pagedDto.StartTime.HasValue, d => d.SendTime >= pagedDto.StartTime)
                 .WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)
                 .OrderByDescending(it => it.CreationTime)

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -18,10 +18,10 @@ namespace Hotline.Application.Mappers
                 .AfterMapping((s, t) => t.InitExpired());
 
             config.ForType<Message, MessageDataDto>()
-               .Map(d => d.SendUser, x => x.User.Name)
-               .Map(d => d.SendOrganize, x => x.SystemOrganize.Name)
-               .Map(d => d.OrderId, x => x.Order.Id)
-               .Map(d => d.OrderNo, x => x.Order.No);
+               .Map(d => d.SendUser, x => x.CreatorName)
+               .Map(d => d.SendOrganize, x => x.CreatorOrgName)
+               .IgnoreIf((s,d)=> s.Order!=null, x => x.OrderId)
+               .IgnoreIf((s,d)=> s.Order!=null, x => x.OrderNo);
 
             #region org
 

src/Hotline.Share/Dtos/Push/FWMessage/MessageDataDto.cs

@@ -1,4 +1,5 @@
-using Hotline.Share.Enums.Push;
+using Hotline.Share.Dtos.Order;
+using Hotline.Share.Enums.Push;
 using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Push.FWMessage
@@ -44,12 +45,12 @@ namespace Hotline.Share.Dtos.Push.FWMessage
         /// <summary>
         /// 发送人
         /// </summary>
-        public string SendUser { get; set; }
+        public string? SendUser { get; set; }
 
         /// <summary>
         /// 发送部门
         /// </summary>
-        public string SendOrganize { get; set; }
+        public string? SendOrganize { get; set; }
 
         /// <summary>
         /// 备注
@@ -66,6 +67,8 @@ namespace Hotline.Share.Dtos.Push.FWMessage
         /// </summary>
         public string? OrderId { get; set; }
 
+
+
         /// <summary>
         /// 推送状态
         /// </summary>

src/Hotline/Push/FWMessage/Message.cs

@@ -138,23 +138,11 @@ namespace Hotline.Push.FWMessage
         [SugarColumn(ColumnDescription = "从发次数")]
         public int? ResendCount { get; set; }
 
-        /// <summary>
-        /// 发送人
-        /// </summary>
-        [Navigate(NavigateType.OneToOne, nameof(CreatorId))]//
-        public User User { get; set; }
-
-        /// <summary>
-        /// 发送部门
-        /// </summary>
-        [Navigate(NavigateType.OneToOne, nameof(CreatorOrgId))]//
-        public SystemOrganize SystemOrganize { get; set; }
-
         /// <summary>
         /// 关联工单信息
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(OrderId))]//
-        public Order Order { get; set; }
+        public Order? Order { get; set; }
 
         ///// <summary>
         ///// 参数