src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -424,6 +424,7 @@ namespace Hotline.Api.Controllers
         /// <param name="pagedDto"></param>
         /// <returns></returns>
         [HttpGet("deletelist")]
+        [Permission(EPermission.KnowledgeDeleteApply)]
         public async Task<PagedDto<KnowledgeDataDto>> GetDeleteApplyList([FromQuery] KnowledgeDeletelPagedListDto pagedDto)
         {
             var (total, items) = await _knowledgeWorkFlowRepository

src/Hotline.Api/Permissions/EPermission.cs

@@ -493,73 +493,43 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "知识库管理", Name = "知识删除", Description = "知识删除")]
         KnowledgeDelete = 400122,
-
-        /// <summary>
-        /// 已上架知识
-        /// </summary>
-        [Display(GroupName = "知识库管理", Name = "已上架知识", Description = "已上架知识")]
-        OnTheShelfKnowledge = 400130,
         /// <summary>
         /// 知识下架
         /// </summary>
         [Display(GroupName = "已上架知识", Name = "知识下架", Description = "知识下架")]
-        KnowledgeOffShelf = 400131,
-
-        /// <summary>
-        /// 已下架知识
-        /// </summary>
-        [Display(GroupName = "知识库管理", Name = "已下架知识", Description = "已下架知识")]
-        OffShelfKnowledge = 400140,
+        KnowledgeOffShelf = 400130,
         /// <summary>
         /// 知识上架
         /// </summary>
         [Display(GroupName = "已下架知识", Name = "知识上架", Description = "知识上架")]
-        KnowledgeOnTheShelf = 400141,
-
-        /// <summary>
-        /// 审核中
-        /// </summary>
-        [Display(GroupName = "知识库管理", Name = "审核中", Description = "审核中")]
-        UnderApprovalKnowledge = 400150,
-
-        /// <summary>
-        /// 审批完成
-        /// </summary>
-        [Display(GroupName = "知识库管理", Name = "审批完成", Description = "审批完成")]
-        ApprovedKnowledge = 400160,
-
-        /// <summary>
-        /// 审批不通过
-        /// </summary>
-        [Display(GroupName = "知识库管理", Name = "审批不通过", Description = "审批不通过")]
-        ApprovalFailedKnowledge = 400170,
+        KnowledgeOnTheShelf = 400140,
 
         /// <summary>
         /// 我的草稿箱
         /// </summary>
         [Display(GroupName = "知识库管理", Name = "我的草稿箱", Description = "我的草稿箱")]
-        KnowledgeMyDraftsList = 400180,
+        KnowledgeMyDraftsList = 400150,
         /// <summary>
         /// 新增草稿
         /// </summary>
         [Display(GroupName = "我的草稿箱", Name = "新增草稿", Description = "新增草稿")]
-        KnowledgeDraftsAdd = 400181,
+        KnowledgeDraftsAdd = 400151,
         /// <summary>
         /// 修改草稿
         /// </summary>
         [Display(GroupName = "我的草稿箱", Name = "修改草稿", Description = "修改草稿")]
-        KnowledgeDraftsUpdate = 400182,
+        KnowledgeDraftsUpdate = 400152,
         /// <summary>
         /// 删除草稿
         /// </summary>
         [Display(GroupName = "我的草稿箱", Name = "删除草稿", Description = "删除草稿")]
-        KnowledgeDraftsDelete = 400183,
+        KnowledgeDraftsDelete = 400153,
 
         /// <summary>
         /// 我的知识删除申请
         /// </summary>
         [Display(GroupName = "知识库管理", Name = "我的知识删除申请", Description = "我的知识删除申请")]
-        KnowledgeDeleteApply = 400190,
+        KnowledgeDeleteApply = 400160,
         #endregion
         #endregion
 
@@ -640,24 +610,6 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "知识库审核管理", Name = "审核管理全部", Description = "审核管理全部")]
         KnowledgeApprovedAllList = 400310,
-
-        /// <summary>
-        /// 审核管理待审核
-        /// </summary>
-        [Display(GroupName = "知识库审核管理", Name = "审核管理待审核", Description = "审核管理待审核")]
-        KnowledgeToBeReviewed = 400320,
-
-        /// <summary>
-        /// 审核管理审核通过
-        /// </summary>
-        [Display(GroupName = "知识库审核管理", Name = "审核管理审核通过", Description = "审核管理审核通过")]
-        KnowledgeApprovedList = 400330,
-
-        /// <summary>
-        /// 审核管理审核不通过
-        /// </summary>
-        [Display(GroupName = "知识库审核管理", Name = "审核管理审核不通过", Description = "审核管理审核不通过")]
-        KnowledgeApprovedFailedList = 400340,
         #endregion
 
         #region 知识库申请管理
@@ -680,40 +632,20 @@ namespace Hotline.Permissions
         [Display(GroupName = "我的知识申请", Name = "我的全部知识申请", Description = "我的全部知识申请")]
         KnowledgeAllApply = 400411,
         /// <summary>
-        /// 我的知识申请处理中
-        /// </summary>
-        [Display(GroupName = "我的知识申请", Name = "我的知识申请处理中", Description = "我的知识申请处理中")]
-        KnowledgeProcessingApply = 400412,
-        /// <summary>
-        /// 我的知识申请已处理
-        /// </summary>
-        [Display(GroupName = "我的知识申请", Name = "我的知识申请已处理", Description = "我的知识申请已处理")]
-        KnowledgeEndApply = 400413,
-        /// <summary>
-        /// 我的知识申请退回
-        /// </summary>
-        [Display(GroupName = "我的知识申请", Name = "我的知识申请退回", Description = "我的知识申请退回")]
-        KnowledgeReturnApply = 400414,
-        /// <summary>
-        /// 我的知识申请已撤销
-        /// </summary>
-        [Display(GroupName = "我的知识申请", Name = "我的知识申请已撤销", Description = "我的知识申请已撤销")]
-        KnowledgeRevokeApply = 400415,
-        /// <summary>
         /// 发起申请按钮
         /// </summary>
         [Display(GroupName = "我的知识申请", Name = "发起申请按钮", Description = "发起申请按钮")]
-        KnowledgeApplyAdd = 400416,
+        KnowledgeApplyAdd = 400412,
         /// <summary>
         /// 修改申请按钮
         /// </summary>
         [Display(GroupName = "我的知识申请", Name = "修改申请按钮", Description = "修改申请按钮")]
-        KnowledgeUpdateAdd = 400417,
+        KnowledgeUpdateAdd = 400413,
         /// <summary>
         /// 撤销操作按钮
         /// </summary>
         [Display(GroupName = "我的知识申请", Name = "撤销操作按钮", Description = "撤销操作按钮")]
-        KnowledgeApplyRevoke = 400418,
+        KnowledgeApplyRevoke = 400414,
         #endregion
 
         #region 知识申请处理

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -282,7 +282,7 @@ namespace Hotline.KnowledgeBase
                     //修改知识状态为已上架
                     knowledge.Status = EKnowledgeStatus.OnShelf;
                     knowledge.OnShelfTime = System.DateTime.Now;
-                    await _knowledgeRepository.UpdateAsync(knowledge);
+                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
                     break;
                 case WorkflowModuleConsts.KnowledgeUpdate://修改
                     //处理知识版本号
@@ -300,7 +300,7 @@ namespace Hotline.KnowledgeBase
                     //修改知识状态为已上架
                     knowledge.Status = EKnowledgeStatus.OnShelf;
                     knowledge.OnShelfTime = System.DateTime.Now;
-                    await _knowledgeRepository.UpdateAsync(knowledge);
+                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
                     break;
 
                 case WorkflowModuleConsts.KnowledgeDelete://删除
@@ -308,7 +308,7 @@ namespace Hotline.KnowledgeBase
                     knowledge.Status = EKnowledgeStatus.OffShelf;
                     knowledge.OffShelfTime = System.DateTime.Now;
                     knowledge.WorkflowId = workflow.Id;
-                    await _knowledgeRepository.UpdateAsync(knowledge);
+                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
                     //删除知识
                     await _knowledgeRepository.RemoveAsync(p => p.Code == knowledge.Code, true, cancellationToken);
                     break;