Merge branch 'refactor/knowledge' into dev

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -282,7 +282,7 @@ namespace Hotline.Api.Controllers
         /// 知识库-知识下架并发起审批(new)
         /// </summary>
         [HttpPost("offshelf-and-approve")]
-        [LogFilter("知识下架")]
+        [LogFilter("知识下架并发起审批")]
         public async Task OffShelfAndApprove([FromBody] OffShelfKnowledgeDto dto)
         {
             var kn = await _knowledgeDomainService.OffShelfAsync(dto, HttpContext.RequestAborted);
@@ -615,17 +615,15 @@ namespace Hotline.Api.Controllers
         [HttpGet("search_num/list")]
         public async Task<PagedDto<KnowledgeDto>> SearchNumList([FromQuery] KnowledgeCollectListDto dto)
         {
-
-            var query = _knowledgeRepository.Queryable(false, true, false)
+            var query = _knowledgeRepository.Queryable()
                 .Where(x => x.Status == EKnowledgeStatus.OnShelf)
-                .Where(m => m.IsDeleted == false)
                 .Where(x => (x.ExpiredTime != null && x.ExpiredTime >= DateTime.Now) || x.ExpiredTime == null)
                 .OrderByDescending(x => x.SearchNum);
 
             if (_sessionContext.OrgIsCenter == false)
             {
-                query = query.Where(m => m.KnowledgeTypes.Any(a => a.IsDeleted == false && a.KnowledgeTypeOrgs
-                .Any(k => k.OrgId.StartsWith(_sessionContext.OrgId))));
+                query = query.Where(m => m.KnowledgeTypes.Any(a => a.IsDeleted == false && a.Orgs
+                .Any(k => k.Id.StartsWith(_sessionContext.RequiredOrgId))));
                 query = query.Where(m => m.Attribution == "部门知识库");
             }
             var (total, items) = await query.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);

src/Hotline.Application/Mappers/KnowledgeMapperConfigs.cs

@@ -71,6 +71,10 @@ public class KnowledgeMapperConfigs : IRegister
             .Map(d => d.DisableDate, x => x.ExpiredTime)
             .Map(d => d.UID, x => x.Code)
             .IgnoreIf((s, d) => s.FileJson == null, d => d.FileJson)
+            .IgnoreIf((s,d)=>s.HotspotType == null, d=>d.CategoryCode)
+            .IgnoreIf((s,d)=>s.HotspotType == null, d=>d.CategoryName)
+            .IgnoreIf((s,d)=>s.User == null, d=>d.PublishPerson)
+            .IgnoreIf((s,d)=>s.SystemOrganize == null, d=>d.OuName)
             ;
 
         config.ForType<KnowledgeRelationTypeDto, KnowledgeType>()