田爽 hai 1 ano
pai
achega
a20d64502f

+ 1 - 0
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -1068,6 +1068,7 @@ namespace Hotline.Api.Controllers
 				.WhereIF(!string.IsNullOrEmpty(dto.Keyword),x=>x.Knowledge.Title.Contains(dto.Keyword!)||( x.Knowledge.Summary != null &&  x.Knowledge.Summary.Contains(dto.Keyword!)))
 				.Where(x=>x.CreatorId == _sessionContext.UserId)
 				.Where(x => !string.IsNullOrEmpty(x.Knowledge.Id))
+				.Where(x=>x.Collect.HasValue && x.Collect.Value)
 				.OrderByDescending(x => x.CreationTime)
 				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 			return new PagedDto<KnowledgeCollectDto>(total,_mapper.Map<IReadOnlyList<KnowledgeCollectDto>>(items));

+ 19 - 13
src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -214,19 +214,25 @@ namespace Hotline.KnowledgeBase
             workFlow.WorkFlowApplyStatus = EKnowledgeWorkFlowStatus.Revoke;
             await _knowledgeWorkFlowRepository.UpdateAsync(workFlow);
 
-            switch (workFlow.WorkflowModuleStatus)
-            {
-                case EKnowledgeApplyType.Add:
-                    //将知识保存为草稿
-                    knowledge.Status = EKnowledgeStatus.Drafts;
-                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
-                    break;
-                default:
-                    //现有知识状态更改为已撤回
-                    knowledge.Status = EKnowledgeStatus.Revert;
-                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
-                    break;
-            }
+            //现有知识状态更改为已撤回
+            knowledge.Status = EKnowledgeStatus.Revert;
+            await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+
+			//switch (workFlow.WorkflowModuleStatus)
+   //         {
+   //             case EKnowledgeApplyType.Add:
+   //                 //将知识保存为草稿
+   //                 knowledge.Status = EKnowledgeStatus.Drafts;
+   //                 await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+   //                 break;
+   //             default:
+   //                 //现有知识状态更改为已撤回
+   //                 knowledge.Status = EKnowledgeStatus.Revert;
+   //                 await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+   //                 break;
+
+                   
+			//}
         }
 
         /// <summary>