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

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -425,17 +425,18 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [HttpGet("deletelist")]
         [Permission(EPermission.KnowledgeDeleteApply)]
-        public async Task<PagedDto<KnowledgeDataDto>> GetDeleteApplyList([FromQuery] KnowledgeDeletelPagedListDto pagedDto)
+        public async Task<PagedDto<KnowledgeDeleteApplyDataDto>> GetDeleteApplyList([FromQuery] KnowledgeDeletelPagedListDto pagedDto)
         {
             var (total, items) = await _knowledgeWorkFlowRepository
                .Queryable()
                .Includes(it => it.Knowledge)
-               .Includes(it => it.Knowledge.User)
-               .Includes(it => it.Knowledge.SystemOrganize)
-               .Includes(it => it.Knowledge.KnowledgeType)
-               .Includes(it => it.Knowledge.HotSpotType)
+               .Includes(it => it.Knowledge)
+               .Includes(it => it.Knowledge, it => it.User)
+               .Includes(it => it.Knowledge, it => it.SystemOrganize)
+               .Includes(it => it.Knowledge, it => it.KnowledgeType)
+               .Includes(it => it.Knowledge, it => it.HotSpotType)
                .Includes(it => it.Workflow)
-               .Where(d => d.CreatorId == _sessionContext.RequiredUserId)
+               .Where(d => d.CreatorId == _sessionContext.RequiredUserId && d.WorkflowModuleStatus == EKnowledgeApplyType.Delete)
                .WhereIF(pagedDto.EKnowledgeWorkFlowStatus.HasValue, d => d.WorkFlowApplyStatus == pagedDto.EKnowledgeWorkFlowStatus)
                .WhereIF(pagedDto.StartApplyTime.HasValue, d => d.CreationTime >= pagedDto.StartApplyTime)
                .WhereIF(pagedDto.EndApplyTime.HasValue, d => d.CreationTime <= pagedDto.EndApplyTime)
@@ -446,7 +447,7 @@ namespace Hotline.Api.Controllers
                .OrderByDescending(p => p.CreationTime)
                .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
 
-            return new PagedDto<KnowledgeDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDataDto>>(items));
+            return new PagedDto<KnowledgeDeleteApplyDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDeleteApplyDataDto>>(items));
         }
 
         #endregion
@@ -464,9 +465,9 @@ namespace Hotline.Api.Controllers
             var (total, items) = await _knowledgeWorkFlowRepository
                 .Queryable()
                 .Includes(it => it.Knowledge)
-                .Includes(it => it.Knowledge.User)
-                .Includes(it => it.Knowledge.SystemOrganize)
-                .Includes(it => it.Knowledge.KnowledgeType)
+                .Includes(it => it.Knowledge, it => it.User)
+                .Includes(it => it.Knowledge, it => it.SystemOrganize)
+                .Includes(it => it.Knowledge, it => it.KnowledgeType)
                 .Includes(it => it.Workflow)
 
                 .WhereIF(pagedDto.EKnowledgeApplyType.HasValue, d => d.WorkflowModuleStatus == pagedDto.EKnowledgeApplyType)

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -109,6 +109,17 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.WorkflowModuleStatus, x => x.WorkflowModuleStatus)
                 .Map(d => d.Time, x => x.Workflow.CurrentStepTime);
 
+            config.NewConfig<KnowledgeWorkFlow, KnowledgeDeleteApplyDataDto>()
+                 .Map(d => d.Id, x => x.Knowledge.Id)
+                  .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.PageView, x => x.Knowledge.PageView)
+               .Map(d => d.Status, x => x.Knowledge.Status)
+               .Map(d => d.WorkFlowApplyStatus, x => x.WorkflowModuleStatus);
+
             #endregion
 
             #region order

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

@@ -148,4 +148,25 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string Department { get; set; }
     }
+
+    /// <summary>
+    /// 我的申请返回
+    /// </summary>
+    public record KnowledgeDeleteApplyDataDto : KnowledgeBaseDataDto
+    {
+        /// <summary>
+        /// 申请部门
+        /// </summary>
+        public string CreationBMName { get; set; }
+
+        /// <summary>
+        /// 审批状态
+        /// </summary>
+        public EKnowledgeWorkFlowStatus WorkFlowApplyStatus { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        public DateTime CreationTime { get; set; }
+    }
 }

src/Hotline/KnowledgeBase/KnowledgeTypeDomainService.cs

@@ -58,12 +58,12 @@ namespace Hotline.KnowledgeBase
             if (type is null)
                 throw UserFriendlyException.SameMessage("编辑失败！");
             bool result = false;
-            //是否更改分类名称
-            if (type.Name != dto.Name)
+            //是否更改分类名称或者层级
+            if (type.Name != dto.Name || type.ParentId != dto.ParentId)
                 result = true;
             //转换
             _mapper.Map(dto, type);
-            //如果更改了名称，则修改全称，未更改不修改
+            //如果更改了名称或者修改了层级，则修改全称，未更改不修改
             if (result)
             {
                 string FullName = await GetFullName(type.ParentId);//获取分类名称全称
@@ -112,7 +112,7 @@ namespace Hotline.KnowledgeBase
             var type = await _knowledgeTypeRepository.GetAsync(Id);
             if (type is null)
                 throw UserFriendlyException.SameMessage("分类不存在！");
-            if (type.IsEnable)//禁用
+            if (type.IsEnable)//启用
             {
                 //查询子级数据
                 var getChild = await _knowledgeTypeRepository.GetChild(Id);
@@ -126,7 +126,7 @@ namespace Hotline.KnowledgeBase
                     await _knowledgeTypeRepository.UpdateRangeAsync(getChild, cancellationToken);
                 }
             }
-            else //启用
+            else //禁用
             {
                 //查询上级是否是启用状态，如果是禁用状态不能修改
                 var CheckParent = await _knowledgeTypeRepository.GetAsync(type.ParentId, cancellationToken);

src/Hotline/KnowledgeBase/KnowledgeWorkFlow.cs

@@ -1,6 +1,5 @@
 using Hotline.FlowEngine.Workflows;
 using Hotline.Share.Enums.KnowledgeBase;
-using Hotline.Users;
 using SqlSugar;
 using XF.Domain.Repository;
 
@@ -32,7 +31,7 @@ namespace Hotline.KnowledgeBase
         /// <summary>
         /// 流程信息
         /// </summary>
-        [Navigate(NavigateType.OneToOne, nameof(KnowledgeId))]//一对一 
-        public Workflow Workflow  { get; set; }
+        [Navigate(NavigateType.OneToOne, nameof(WorkflowId))]//一对一 
+        public Workflow Workflow { get; set; }
     }
 }