Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -392,6 +392,7 @@ namespace Hotline.Api.Controllers
             //if (string.IsNullOrEmpty(pagedDto.Keyword))
             //    throw UserFriendlyException.SameMessage("请输入关键字");
             RefAsync<int> total = 0;
+            var Keyword = pagedDto.Keyword?.Trim();
             var temp = await _knowledgeRepository
               .Queryable()
               .Where(p => p.IsDeleted == false)
@@ -412,9 +413,9 @@ namespace Hotline.Api.Controllers
            .MergeTable()
            //取第一条数据
            .Where(d => d.index == 1 && d.Status == EKnowledgeStatus.OnShelf)
-           .WhereIF(pagedDto.RetrievalType == null || pagedDto.RetrievalType == EKnowledgeRetrievalType.All, d => d.Title.Contains(pagedDto.Keyword) || d.Content.Contains(pagedDto.Keyword))// || d.Additions.Contains(pagedDto.Keyword)
-           .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Title, d => d.Title.Contains(pagedDto.Keyword))
-           .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Content, d => d.Content.Contains(pagedDto.Keyword))
+           .WhereIF((pagedDto.RetrievalType == null || pagedDto.RetrievalType == EKnowledgeRetrievalType.All) && !string.IsNullOrEmpty(Keyword), d => d.Title.Contains(Keyword) || d.Content.Contains(Keyword))// || d.Additions.Contains(pagedDto.Keyword)
+           .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Title && !string.IsNullOrEmpty(Keyword), d => d.Title.Contains(Keyword))
+           .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Content && !string.IsNullOrEmpty(Keyword), d => d.Content.Contains(Keyword))
            // .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Enclosure, d => d.Additions.Contains(pagedDto.Keyword))
            .OrderByDescending(p => p.PageView)
            .ToPageListAsync(pagedDto.PageIndex, pagedDto.PageSize, total);
@@ -436,9 +437,8 @@ namespace Hotline.Api.Controllers
             var (total, items) = await _knowledgeWorkFlowRepository
                .Queryable(includeDeleted: true)
                .Includes(it => it.Knowledge)
-               .Includes(it => it.Knowledge)
-               .Includes(it => it.Knowledge, it => it.User)
-               .Includes(it => it.Knowledge, it => it.SystemOrganize)
+               .Includes(it => it.User)
+               .Includes(it => it.SystemOrganize)
                .Includes(it => it.Knowledge, it => it.KnowledgeType)
                .Includes(it => it.Knowledge, it => it.HotspotType)
                .Includes(it => it.Workflow)
@@ -471,8 +471,8 @@ namespace Hotline.Api.Controllers
             var (total, items) = await _knowledgeWorkFlowRepository
                 .Queryable(includeDeleted: true)
                 .Includes(it => it.Knowledge)
-                .Includes(it => it.Knowledge, it => it.User)
-                .Includes(it => it.Knowledge, it => it.SystemOrganize)
+                .Includes(it => it.User)
+                .Includes(it => it.SystemOrganize)
                 .Includes(it => it.Knowledge, it => it.KnowledgeType)
                 .Includes(it => it.Workflow)
 

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -100,9 +100,9 @@ namespace Hotline.Application.Mappers
                  .Map(d => d.CreateBMName, x => x.SystemOrganize.OrgName);
 
             config.NewConfig<KnowledgeWorkFlow, KnowledgeApprovalDataDto>()
-                .Map(d => d.CreationName, x => x.Knowledge.User.Name)
+                .Map(d => d.CreationName, x => x.User.Name)
                 .Map(d => d.KnowledgeTypeName, x => x.Knowledge.KnowledgeType.SpliceName)
-                .Map(d => d.CreateBMName, x => x.Knowledge.SystemOrganize.OrgName)
+                .Map(d => d.CreateBMName, x => x.SystemOrganize.OrgName)
                 .Map(d => d.Id, x => x.Knowledge.Id)
                 .Map(d => d.Title, x => x.Knowledge.Title)
                 .Map(d => d.PageView, x => x.Knowledge.PageView)
@@ -115,8 +115,8 @@ namespace Hotline.Application.Mappers
                   .Map(d => d.Title, x => x.Knowledge.Title)
                .Map(d => d.KnowledgeTypeName, x => x.Knowledge.KnowledgeType.SpliceName)
                .Map(d => d.HotspotName, x => x.Knowledge.HotspotType.HotSpotFullName)
-               .Map(d => d.CreationName, x => x.Knowledge.User.Name)
-               .Map(d => d.CreationBMName, x => x.Knowledge.SystemOrganize.OrgName)
+               .Map(d => d.CreationName, x => x.User.Name)
+               .Map(d => d.CreationBMName, x => x.SystemOrganize.OrgName)
                .Map(d => d.PageView, x => x.Knowledge.PageView)
                .Map(d => d.Status, x => x.Knowledge.Status)
                .Map(d => d.WorkFlowApplyStatus, x => x.WorkFlowApplyStatus);

src/Hotline/KnowledgeBase/KnowledgeWorkFlow.cs

@@ -1,5 +1,7 @@
 using Hotline.FlowEngine.Workflows;
+using Hotline.Settings;
 using Hotline.Share.Enums.KnowledgeBase;
+using Hotline.Users;
 using SqlSugar;
 using XF.Domain.Repository;
 
@@ -39,6 +41,18 @@ namespace Hotline.KnowledgeBase
         [Navigate(NavigateType.OneToOne, nameof(WorkflowId))]//一对一 
         public Workflow Workflow { get; set; }
 
+        /// <summary>
+        /// 部门
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(CreatorOrgId))]//一对一 
+        public SystemOrganize SystemOrganize { get; set; }
+
+        /// <summary>
+        /// 用户
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(CreatorId))]//一对一 
+        public User User { get; set; }
+
         /// <summary>
         /// 是否可以办理
         /// </summary>