tangjiang 9 сар өмнө
parent
commit
1c1b01beeb

+ 3 - 0
src/Hotline.Api/Controllers/PushMessageController.cs

@@ -129,6 +129,9 @@ namespace Hotline.Api.Controllers
                 .WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)
                 .WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)
                 .WhereIF(!string.IsNullOrEmpty(pagedDto.UserName), d => d.Name.Contains(pagedDto.UserName))
                 .WhereIF(!string.IsNullOrEmpty(pagedDto.UserName), d => d.Name.Contains(pagedDto.UserName))
                  .WhereIF(!string.IsNullOrEmpty(pagedDto.TelNumber), d => d.TelNumber.Contains(pagedDto.TelNumber))
                  .WhereIF(!string.IsNullOrEmpty(pagedDto.TelNumber), d => d.TelNumber.Contains(pagedDto.TelNumber))
+                .WhereIF(!string.IsNullOrEmpty(pagedDto.SendName),d=>d.CreatorName.Contains(pagedDto.SendName))
+                .WhereIF(!string.IsNullOrEmpty(pagedDto.SendOrg), d => d.CreatorOrgName.Contains(pagedDto.SendOrg))
+                .WhereIF(!string.IsNullOrEmpty(pagedDto.SendContent), d => d.Content.Contains(pagedDto.SendContent))
                 .OrderByDescending(it => it.CreationTime)
                 .OrderByDescending(it => it.CreationTime)
                 .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
                 .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
 
 

+ 17 - 2
src/Hotline.Share/Dtos/Push/MessagePagedDto.cs

@@ -31,11 +31,26 @@ namespace Hotline.Share.Dtos.Push
         /// <summary>
         /// <summary>
         /// 电话号码
         /// 电话号码
         /// </summary>
         /// </summary>
-        public string TelNumber { get; set; }
+        public string? TelNumber { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// 接收人
         /// 接收人
         /// </summary>
         /// </summary>
-        public string UserName { get; set; }
+        public string? UserName { get; set; }
+
+        /// <summary>
+        /// 发送人
+        /// </summary>
+        public string? SendName { get; set; }
+
+        /// <summary>
+        /// 发送部门
+        /// </summary>
+        public string? SendOrg { get; set;}
+
+        /// <summary>
+        /// 发送内容
+        /// </summary>
+        public string? SendContent { get; set;}
     }
     }
 }
 }