知识库修改

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -539,10 +539,8 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [HttpGet("queryRecord/{Id}")]
         [LogFilter("查询知识库修改记录")]
-        public async Task<IList<KnowledgeDto>> QueryRecord(string Id)
+        public async Task<object> QueryRecord(string Id)
         {
-            List<KnowledgeDto> knList = new List<KnowledgeDto>();
-
             var query = await _knowledgeRecordRepository.Queryable()
                 .Includes(x => x.SourceOrganize)
                 .Includes(x => x.KnowledgeTypes)
@@ -580,11 +578,6 @@ namespace Hotline.Api.Controllers
                     knowledgeInfoDto1.Files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
                 }
 
-                if (knowledgeInfoDto1 != null)
-                {
-                    knList.Add(knowledgeInfoDto1);
-                }
-
                 #endregion
             }
 
@@ -623,15 +616,9 @@ namespace Hotline.Api.Controllers
                     knowledgeShowInfoDto.Files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
                 }
 
-                if (knowledgeShowInfoDto != null)
-                {
-                    knList.Add(knowledgeShowInfoDto);
-                }
-
                 #endregion
             }
-
-            return _mapper.Map<IList<KnowledgeDto>>(knList);
+            return new { OldInfo = query, NewInfo = knowledge };
         }
 
         /// <summary>
@@ -2139,7 +2126,17 @@ namespace Hotline.Api.Controllers
 
             var (total, items) = await query.ToPagedListAsync(request, HttpContext.RequestAborted);
 
-            return new PagedDto<KnowledgeApproveDto>(total, _mapper.Map<IReadOnlyList<KnowledgeApproveDto>>(items));
+            var data = _mapper.Map<List<KnowledgeApproveDto>>(items);
+
+            data.ForEach(d =>
+            {
+                if (_knowledgeRecordRepository.Queryable().Where(x => x.RecordId == d.KnowledgeId).Count() > 0)
+                {
+                    d.IsRecord = true;
+                }
+            });
+
+            return new PagedDto<KnowledgeApproveDto>(total, data);
         }
 
         /// <summary>

src/Hotline.Share/Dtos/Knowledge/KnowledgeApproveDto.cs

@@ -70,5 +70,10 @@ namespace Hotline.Share.Dtos.Knowledge
         /// 审批人
         /// </summary>
         public UserDto Approver { get; set; }
+
+        /// <summary>
+        /// 是否存在知识修改记录
+        /// </summary>
+        public bool? IsRecord { get; set; } = false;
     }
 }