src/Hotline.Api/Controllers/KnowledgeApplyController.cs

@@ -196,11 +196,14 @@ namespace Hotline.Api.Controllers
             if (organize != null)
                 dataKnowledgeApplyDto.CreationBMName = organize.OrgName;
 
+            //审批中，更新审批查询最新的审批通过数据
             if (handle.Status == EKnowledgeApplyStatus.Handling && handle.KnowledgeApplyType == EApplyType.Update)
             {
+                //查询当前数据的Code
                 var know = await _knowledgeDomainService.KnowledgeInfo(handle.KnowledgeId, HttpContext.RequestAborted);
                 if (know != null)
                 {
+                    //根据Code查询最新数据
                     var knowledge = await _knowledgeRepository
                     .Queryable()
                     .Where(p => p.Code == know.Code && (p.Status == EKnowledgeStatus.OnShelf || p.Status == EKnowledgeStatus.OffShelf))
@@ -214,11 +217,11 @@ namespace Hotline.Api.Controllers
                         dataKnowledgeApplyDto.KnowledgeId = knowledge.Id;
                     }
                 }
-            }
+            }//审批通过的查询对应版本的数据
             else if (handle.Status == EKnowledgeApplyStatus.Succeed)
             {
                 //这里查询对应的版本
-                var knowledge = await _knowledgeRepository.GetAsync(p => p.Id == handle.KnowledgeId, HttpContext.RequestAborted);
+                var knowledge = await _knowledgeDomainService.KnowledgeInfo(handle.KnowledgeId, HttpContext.RequestAborted);
                 if (knowledge != null)
                 {
                     dataKnowledgeApplyDto.KBID = knowledge.Id;
@@ -226,30 +229,6 @@ namespace Hotline.Api.Controllers
                 }
             }
 
-            ////这里查询最新的版本
-            //if (!string.IsNullOrEmpty(handle.Code))
-            //{
-            //    var knowledge = await _knowledgeRepository
-            //         .Queryable()
-            //         .Where(p => p.Code == handle.Code && p.IsDeleted == false && (p.Status == EKnowledgeStatus.OnShelf || p.Status == EKnowledgeStatus.OffShelf))
-            //         .OrderByDescending(p => p.Version)
-            //         .Take(1)
-            //         .FirstAsync();
-            //    if (knowledge != null)
-            //    {
-            //        dataKnowledgeApplyDto.KBID = knowledge.Id;
-            //        dataKnowledgeApplyDto.KBTitle = knowledge.Title;
-            //    }
-            //}
-
-            ////这里查询对应的版本
-            //var knowledge = await _knowledgeRepository.GetAsync(p => p.Id == handle.KnowledgeId, HttpContext.RequestAborted);
-            //if (knowledge != null)
-            //{
-            //    dataKnowledgeApplyDto.KBID = knowledge.Id;
-            //    dataKnowledgeApplyDto.KBTitle = knowledge.Title;
-            //}
-
             return dataKnowledgeApplyDto;
         }