Merge branch 'refactor/knowledge' into dev

src/Hotline.Application/Mappers/KnowledgeMapperConfigs.cs

@@ -25,7 +25,15 @@ public class KnowledgeMapperConfigs : IRegister
 
         config.ForType<KnowledgeBase.Knowledge, KnowledgeDto>()
             .IgnoreIf((s, d) => s.SourceOrganize == null, d => d.SourceOrganize)
-            .Ignore(d => d.Collect);
+            .Ignore(d => d.Collect)
+            .AfterMapping((s, d) => d.KnowledgeTypeText = s.KnowledgeTypes != null && s.KnowledgeTypes.Any()
+                ? string.Join(',', s.KnowledgeTypes.Select(x => x.Name))
+                : string.Empty); 
+
+        config.ForType<KnowledgeBase.Knowledge, KnowledgeInfoDto>()
+            .AfterMapping((s, d) => d.KnowledgeTypeText = s.KnowledgeTypes != null && s.KnowledgeTypes.Any()
+                ? string.Join(',', s.KnowledgeTypes.Select(x => x.Name))
+                : string.Empty);
 
         config.NewConfig<Hotline.KnowledgeBase.Knowledge, KnowledgeApprovalDataDto>()
             .Map(d => d.CreatorName, x => x.User.Name)

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

@@ -49,6 +49,19 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public DateTime? ApproveTime { get; set; }
 
+        public string Id { get; set; }
+
+        public string? CreatorId { get; set; }
+
+        public string? CreatorName { get; set; }
+
+        public string? CreatorOrgId { get; set; }
+
+        public string? CreatorOrgName { get; set; }
+
+        public int CreatorOrgLevel { get; set; }
+
+
         public KnowledgeDto Knowledge { get; set; }
 
         /// <summary>

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

@@ -150,25 +150,26 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string? Source { 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 "";
-  //      }
+        /// <summary>
+        /// 知识分类名称
+        /// </summary>
+        //public string KnowledgeTypeText => GetKnowledgeTypeText(KnowledgeType);
+        public string KnowledgeTypeText { get; set; }
+
+        ///// <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 "";
+        //      }
 
         /// <summary>
         /// 标签名称

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -68,10 +68,11 @@ namespace Hotline.KnowledgeBase
         /// <returns></returns>
         public async Task<Knowledge> KnowledgeInfo(string Id, CancellationToken cancellationToken)
         {
-            var know = await _knowledgeRepository.Queryable(false, false, false)
-                .Includes(x => x.Workflow, d => d.Steps)
+            var know = await _knowledgeRepository.Queryable()
+                //.Includes(x => x.Workflow, d => d.Steps)
                 .Includes(x => x.SourceOrganize)
-                .Includes(x => x.KnowledgeType).FirstAsync(p => p.Id == Id);
+                .Includes(x => x.KnowledgeTypes)
+                .FirstAsync(p => p.Id == Id, cancellationToken);
             if (know is null)
                 throw UserFriendlyException.SameMessage("知识查询失败！");
             return know;