知识库分类

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -517,11 +517,19 @@ namespace Hotline.Api.Controllers
         public async Task UpdateAndRecord([FromBody] UpdateKnowledgeAndApproveDto dto)
         {
             // 知识库记录
-            var knowledge = await _knowledgeRepository.GetAsync(d => d.Id == dto.Id);
+            var knowledge = await _knowledgeRepository.Queryable()
+                .Includes(x => x.SourceOrganize)
+                .Includes(x => x.KnowledgeTypes)
+                .Includes(x => x.KnowledgeOrganizes)
+                .Includes(x => x.HotspotType)
+                .FirstAsync(d => d.Id == dto.Id);
             if (knowledge != null)
             {
                 var data = _mapper.Map<KnowledgeRecord>(knowledge);
                 data.KnowledgeId = knowledge.Id;
+                data.knowledgeRecordTypeText = knowledge.KnowledgeTypes != null && knowledge.KnowledgeTypes.Any()
+                                               ? string.Join(',', knowledge.KnowledgeTypes.Select(x => x.Name))
+                                               : string.Empty;
                 await _knowledgeRecordRepository.AddNav(data)
                       .Include(d => d.KnowledgeTypes)
                       .Include(d => d.KnowledgeOrganizes)
@@ -541,8 +549,8 @@ namespace Hotline.Api.Controllers
         [LogFilter("查询知识库修改记录")]
         public async Task<object> QueryRecord(string Id)
         {
-            var queryDto = new KnowledgeDto();
-            var knowledgeDto = new KnowledgeDto();
+            var queryDto = new KnowledgeRecordDto();
+            var knowledgeDto = new KnowledgeRecordDto();
 
             var query = await _knowledgeRecordRepository.Queryable()
                 .Includes(x => x.SourceOrganize)
@@ -581,7 +589,7 @@ namespace Hotline.Api.Controllers
                     knowledgeInfoDto1.Files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
                 }
 
-                queryDto = _mapper.Map<KnowledgeDto>(query);
+                queryDto = _mapper.Map<KnowledgeRecordDto>(query);
 
                 #endregion
             }
@@ -621,8 +629,10 @@ namespace Hotline.Api.Controllers
                     knowledgeShowInfoDto.Files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
                 }
 
-                knowledgeDto = _mapper.Map<KnowledgeDto>(knowledge);
-
+                knowledgeDto = _mapper.Map<KnowledgeRecordDto>(knowledge);
+                knowledgeDto.knowledgeRecordTypeText = knowledge.KnowledgeTypes != null && knowledge.KnowledgeTypes.Any()
+                                                        ? string.Join(',', knowledge.KnowledgeTypes.Select(x => x.Name))
+                                                        : string.Empty;
                 #endregion
             }
             return new { OldInfo = queryDto, NewInfo = knowledgeDto };

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

@@ -166,6 +166,17 @@ namespace Hotline.Share.Dtos.Knowledge
         public string OrgId { get; set; }
     }
 
+    /// <summary>
+    /// 知识库记录
+    /// </summary>
+    public class KnowledgeRecordDto : KnowledgeDto
+    {
+        /// <summary>
+        /// 知识库记录分类值
+        /// </summary>
+        public string? knowledgeRecordTypeText { get; set; }
+    }
+
     /// <summary>
     /// 基础
     /// </summary>

src/Hotline/KnowledgeBase/KnowledgeRecord.cs

@@ -10,9 +10,15 @@ namespace Hotline.KnowledgeBase
     public class KnowledgeRecord : Knowledge
     {
         /// <summary>
-        /// 记录ID
+        /// 知识ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "记录ID")]
+        [SugarColumn(ColumnDescription = "知识ID")]
         public string KnowledgeId { get; set; }
+
+
+        /// <summary>
+        /// 知识记录分类值
+        /// </summary>
+        public string knowledgeRecordTypeText { get; set; }
     }
 }