瀏覽代碼

退回列表增加查询状态all

田爽 5 月之前
父節點
當前提交
dd6c6fcbc0

+ 1 - 1
src/Hotline.Application/Orders/OrderSendBackAuditApplication.cs

@@ -35,7 +35,7 @@ namespace Hotline.Application.Orders
 				.WhereIF(dto.EndTime.HasValue, d => d.CreationTime <= dto.EndTime)
 				.WhereIF(dto.AuditState == 1, d => d.State == ESendBackAuditState.Apply)
 				.WhereIF(dto is { AuditState: 2, State: null }, d => d.State > ESendBackAuditState.Apply)
-				.WhereIF(dto.AuditState is 2 or 3 && dto.State.HasValue, d => d.State == dto.State)
+				.WhereIF(dto.AuditState is 2 or 3 && dto.State.HasValue && dto.State != ESendBackAuditState.All, d => d.State == dto.State)
 				.WhereIF(dto.AuditState == 3 && _sessionContext.RequiredOrgId != OrgSeedData.CenterId, x => x.ApplyOrgId.StartsWith(_sessionContext.OrgId))
 				.WhereIF(_sessionContext.Roles.Contains("role_sysadmin") == false && dto.AuditState != 3, x => x.SendBackOrgId == _sessionContext.OrgId) // 123 系统管理员;
 				.OrderByDescending(x => x.CreationTime);

+ 6 - 0
src/Hotline.Share/Enums/Order/ESendBackAuditState.cs

@@ -10,6 +10,12 @@ namespace Hotline.Share.Enums.Order
 
 	public enum ESendBackAuditState
 	{
+		/// <summary>
+		/// 全部-- 查询使用
+		/// </summary>
+		[Description("全部")]
+		All = -1,
+
 		/// <summary>
 		/// 待办
 		/// </summary>