Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -909,7 +909,8 @@ public class OrderController : BaseController
             .WhereIF(dto.EndTime.HasValue, d => d.VisitTime <= dto.EndTime)
             .WhereIF(dto.StartPublishTime.HasValue && dto.EndPublishTime.HasValue, d => d.PublishTime >= dto.StartPublishTime && d.PublishTime <= dto.EndPublishTime) // 发布时间
             .WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.Order.ActualHandleOrgName == dto.ActualHandleOrgName) //接办部门
-            .OrderByDescending(x => x.PublishTime)
+            .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneName), d => d.Order.OrgLevelOneName.Contains(dto.OrgLevelOneName)) //一级部门
+			.OrderByDescending(x => x.PublishTime)
             .WhereIF(dto.Channel.NotNullOrEmpty(), d => d.Order.SourceChannelCode == dto.Channel)
             .OrderByDescending(d => d.PublishTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);

src/Hotline.Application/Orders/OrderApplication.cs

@@ -695,6 +695,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.ActualHandleOrgName.Contains(dto.ActualHandleOrgName)) //接办部门（综合查询模糊）
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.AcceptTypeCode == dto.AcceptType) //受理类型
             .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
+            .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneName),d=>d.OrgLevelOneName.Contains(dto.OrgLevelOneName)) //一级部门
             .WhereIF(!string.IsNullOrEmpty(dto.FromPhone), d => d.FromPhone == dto.FromPhone) //来电号码
                                                                                               //.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
                                                                                               //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -115,6 +115,11 @@ namespace Hotline.Share.Dtos.Order
 		/// 接办部门
 		/// </summary>
 		public string? ActualHandleOrgName { get;  set; }
+
+		/// <summary>
+		/// 一级部门
+		/// </summary>
+		public string? OrgLevelOneName { get; set; }
 	}
 
     public record QueryOrderPublishStatisticsAllDto : PagedRequest

src/Hotline.Share/Dtos/Order/Publish/QueryOrderPublishDto.cs

@@ -121,4 +121,9 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// 查询批次
     /// </summary>
     public int QueryIndex { get; set; }
+
+	/// <summary>
+	/// 一级部门
+	/// </summary>
+    public string? OrgLevelOneName { get; set; }
 }