src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -1983,7 +1983,6 @@ namespace Hotline.Api.Controllers
         {
             var query = _knowledgeApproRepository.Queryable()
                 .Includes(d => d.Knowledge)
-                .Includes(d => d.Creator)
                 .WhereIF(request.KnowledgeApproveType.HasValue, d => d.KnowledgeApproveType == request.KnowledgeApproveType)
                 .WhereIF(request.IsPublic.HasValue, d => d.Knowledge.IsPublic == request.IsPublic)
                 .WhereIF(!string.IsNullOrEmpty(request.Keyword), d => d.CreatorName == request.Keyword
@@ -2018,7 +2017,6 @@ namespace Hotline.Api.Controllers
         public async Task<IReadOnlyList<KnowledgeApproveDto>> QueryKnowledgeApproveByKnId(string knowledgeId)
         {
             var approves = await _knowledgeApproRepository.Queryable()
-                .Includes(d => d.Creator)
                 .Includes(d => d.Approver)
                 .Where(d => d.KnowledgeId == knowledgeId)
                 .OrderBy(d => d.CreationTime)

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

@@ -61,13 +61,10 @@ namespace Hotline.Share.Dtos.Knowledge
 
         public int CreatorOrgLevel { get; set; }
 
+        public DateTime CreationTime { get; set; }
 
-        public KnowledgeDto Knowledge { get; set; }
 
-        /// <summary>
-        /// 发起人
-        /// </summary>
-        public UserDto Creator { get; set; }
+        public KnowledgeDto Knowledge { get; set; }
 
         /// <summary>
         /// 审批人

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

@@ -41,6 +41,11 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string Code { get; set; }
 
+        /// <summary>
+        /// 知识来源
+        /// </summary>
+        public string? Source { get; set; }
+
         /// <summary>
         /// 知识归属
         /// </summary>
@@ -145,11 +150,6 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string? SourceOrganizeId { get; set; }
 
-        /// <summary>
-        /// 知识来源
-        /// </summary>
-        public string? Source { get; set; }
-
         /// <summary>
         /// 知识分类名称
         /// </summary>

src/Hotline/KnowledgeBase/KnowledgeApprove.cs

@@ -54,11 +54,11 @@ namespace Hotline.KnowledgeBase
         [Navigate(NavigateType.OneToOne, nameof(KnowledgeId))]
         public Knowledge Knowledge { get; set; }
 
-        /// <summary>
-        /// 发起人
-        /// </summary>
-        [Navigate(NavigateType.OneToOne, nameof(CreatorId))]
-        public User Creator { get; set; }
+        ///// <summary>
+        ///// 发起人
+        ///// </summary>
+        //[Navigate(NavigateType.OneToOne, nameof(CreatorId))]
+        //public User Creator { get; set; }
 
         /// <summary>
         /// 审批人

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -443,9 +443,8 @@ namespace Hotline.KnowledgeBase
             var knowledge = await _knowledgeRepository.GetAsync(d => d.Id == dto.Id, cancellation);
             if (knowledge == null)
                 throw UserFriendlyException.SameMessage("无效知识编号");
-            if (knowledge.Status == EKnowledgeStatus.OnShelf
-                || knowledge.Status == EKnowledgeStatus.Auditing
-                || (knowledge.ExpiredTime.HasValue && knowledge.ExpiredTime.Value > DateTime.Now))
+            if ((knowledge.Status == EKnowledgeStatus.OnShelf || knowledge.Status == EKnowledgeStatus.Auditing)
+                && (knowledge.ExpiredTime.HasValue && knowledge.ExpiredTime.Value > DateTime.Now))
                 throw UserFriendlyException.SameMessage("知识库数据不可修改");
             var any = await _knowledgeRepository.Queryable()
                 .AnyAsync(x => x.Status == EKnowledgeStatus.OnShelf && x.Title == dto.Title && x.Id != dto.Id, cancellation);
@@ -473,15 +472,10 @@ namespace Hotline.KnowledgeBase
 
             if (dto.KnowledgeType.Any())
             {
-                //var knTypes = _mapper.Map<List<KnowledgeType>>(dto.KnowledgeType);
-                //var knTypes = dto.KnowledgeType.Select(d => new KnowledgeType
-                //{
-                //    Id = d.KnowledgeTypeId,
-                //}).ToList();
                 knowledge.KnowledgeTypes = dto.KnowledgeType.Select(d => new KnowledgeType
                 {
                     Id = d.KnowledgeTypeId,
-                }).ToList(); 
+                }).ToList();
                 await _knowledgeRepository.UpdateNav(knowledge)
                     .Include(d => d.KnowledgeTypes)
                     .ExecuteCommandAsync();