Browse Source

查询条件

田爽 5 tháng trước cách đây
mục cha
commit
0e8b918b46

+ 3 - 1
src/Hotline.Application/Knowledge/KnowApplication.cs

@@ -96,7 +96,9 @@ namespace Hotline.Application.Knowledge
                 .WhereIF(!string.IsNullOrEmpty(pagedDto.CreateOrgId), x => x.SourceOrganizeId != null && x.SourceOrganizeId.EndsWith(pagedDto.CreateOrgId!))
                 .WhereIF(!string.IsNullOrEmpty(pagedDto.ModuleCode), x => x.Workflow.ModuleCode == pagedDto.ModuleCode)
                 .WhereIF(pagedDto.Status ==  EKnowledgeStatus.NewDrafts ,x=>x.Status == EKnowledgeStatus.Drafts || x.Status == EKnowledgeStatus.Revert)
-                .OrderByDescending(d => d.CreationTime)
+                .WhereIF(pagedDto.NewDraftsStatus is EKnowledgeStatus.Drafts , x=>x.Status == EKnowledgeStatus.Drafts)
+                .WhereIF(pagedDto.NewDraftsStatus is EKnowledgeStatus.Revert, x => x.Status == EKnowledgeStatus.Revert)
+				.OrderByDescending(d => d.CreationTime)
                 .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, cancellationToken);
             //返回数据
             return (total, _mapper.Map<IList<KnowledgeDataDto>>(temp));

+ 10 - 5
src/Hotline.Share/Dtos/Knowledge/KnowledgePagedDto.cs

@@ -74,12 +74,17 @@ namespace Hotline.Share.Dtos.Knowledge
         /// <summary>
         /// 状态
         /// </summary>
-        public EKnowledgeStatus? Status { get; set; }    
+        public EKnowledgeStatus? Status { get; set; }
 
-        /// <summary>
-        /// 是否公开
-        /// </summary>
-        public bool? IsPublic { get; set; }
+		/// <summary>
+		/// 草稿状态下的查询条件
+		/// </summary>
+		public EKnowledgeStatus? NewDraftsStatus { get; set; }
+
+		/// <summary>
+		/// 是否公开
+		/// </summary>
+		public bool? IsPublic { get; set; }
 
 		/// <summary>
 		/// 摘要