Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -511,6 +511,7 @@ namespace Hotline.Api.Controllers
                 .Includes(x => x.SourceOrganize)
                 .Includes(x => x.HotspotType)
                 .Includes(x => x.Workflow)
+                .Includes(x=>x.KnowledgeType)
                 //.Includes(x=>x.KnowledgeRelationTypes,t=> t.)
                 .Where(x => x.IsDeleted == false)
                 .Where(x=>x.KnowledgeType.Any(t=>t.KnowledgeType.KnowledgeTypeOrgs.Any(to=>to.OrgId == _sessionContext.RequiredOrgId)))

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

@@ -19,10 +19,33 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string Title { get; set; }
 
-        public List<Kvs> KnowledgeType { get; set; }
+		/// <summary>
+		/// 知识分类
+		/// </summary>
+		public List<KnowledgeRelationTypeDto> KnowledgeType { get; set; }
+
+		/// <summary>
+		/// 知识分类名称
+		/// </summary>
+		public string KnowledgeTypeText => GetKnowledgeTypeText(KnowledgeType);
+
+		/// <summary>
+		/// 获取知识分类名称
+		/// </summary>
+		/// <returns></returns>
+		public string GetKnowledgeTypeText(List<KnowledgeRelationTypeDto> items)
+		{
+
+			if (KnowledgeType != null && KnowledgeType.Any())
+			{
+				var names = KnowledgeType.Select(x => x.KnowledgeTypeName).ToList();
+				return string.Join(",", names);
+			}
+			return "";
+		}
 
 
-        public HotspotDto HotspotType {  get; set; }
+		public HotspotDto HotspotType {  get; set; }
 
         /// <summary>
         /// 热点