Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -12,6 +12,7 @@ using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.Knowledge;
 using Hotline.Share.Enums.KnowledgeBase;
+using Hotline.Share.Enums.Order;
 using Hotline.Users;
 using MapsterMapper;
 using MediatR;
@@ -19,6 +20,7 @@ using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Api.Controllers
 {
@@ -212,10 +214,10 @@ namespace Hotline.Api.Controllers
         /// 知识库-查询详情-增加浏览量
         /// </summary>
         /// <param name="Id">知识Id</param>
-        /// <param name="IsAddPv">默认不增加，如果为空不增加，不为空增加浏览量</param>
+        /// <param name="IsAddPv">默认不增加，false不增加，true增加浏览量</param>
         /// <returns></returns>
         [HttpGet("info/{Id}")]
-        public async Task<KnowledgeShowInfoDto> KnowledgeInfo(string Id, string? IsAddPv = "")
+        public async Task<KnowledgeShowInfoDto> KnowledgeInfo(string Id, bool? IsAddPv)
         {
             var knowledge = await _knowledgeDomainService.KnowledgeInfo(Id, HttpContext.RequestAborted);
             if (knowledge is null)
@@ -235,7 +237,7 @@ namespace Hotline.Api.Controllers
             if (hot != null)
                 knowledgeShowInfoDto.HotspotName = hot.HotSpotFullName;
 
-            if (!string.IsNullOrEmpty(IsAddPv))
+            if (IsAddPv == true)
                 _mediator.Publish(new GetKnowledgeInfoNotify(knowledge));
             return knowledgeShowInfoDto;
         }
@@ -459,6 +461,22 @@ namespace Hotline.Api.Controllers
         #endregion
 
         #region 审核管理
+
+        /// <summary>
+        /// 审核管理页面枚举值
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("approval-base-data")]
+        public async Task<object> ApprovalBaseData()
+        {
+            var rsp = new
+            {
+                EKnowledgeApplyType = EnumExts.GetDescriptions<EKnowledgeApplyType>(),
+                EKnowledgeWorkFlowStatus = EnumExts.GetDescriptions<EKnowledgeWorkFlowStatus>(),
+            };
+            return rsp;
+        }
+
         /// <summary>
         /// 审核管理
         /// </summary>

src/Hotline.Share/Enums/KnowledgeBase/EKnowledgeApplyType.cs

@@ -10,18 +10,18 @@ public enum EKnowledgeApplyType
     /// <summary>
     /// 新增
     /// </summary>
-    [Description("新增")]
+    [Description("发布知识")]
     Add = 0,
 
-    /// <summary>
-    /// 修改
-    /// </summary>
-    [Description("修改")]
-    Update = 1,
+    ///// <summary>
+    ///// 修改
+    ///// </summary>
+    //[Description("修改")]
+    //Update = 1,
 
     /// <summary>
     /// 删除
     /// </summary>
-    [Description("删除")]
+    [Description("删除知识")]
     Delete = 2,
 }

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -48,7 +48,7 @@ namespace Hotline.KnowledgeBase
         /// <returns></returns>
         public async Task<Knowledge> KnowledgeInfo(string Id, CancellationToken cancellationToken)
         {
-            var know = await _knowledgeRepository.GetAsync(Id, cancellationToken);
+            var know = await _knowledgeRepository.Queryable(includeDeleted: true).FirstAsync(p => p.Id == Id);
             if (know is null)
                 throw UserFriendlyException.SameMessage("知识查询失败！");
             return know;
@@ -199,7 +199,7 @@ namespace Hotline.KnowledgeBase
             switch (knowWorkFlow.WorkflowModuleStatus)
             {
                 case EKnowledgeApplyType.Add:
-                case EKnowledgeApplyType.Update:
+                    //case EKnowledgeApplyType.Update:
                     //查询知识
                     var knowledge = await _knowledgeRepository.GetAsync(p => p.WorkflowId == workFlowId, cancellationToken);
                     if (knowledge != null)