src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -302,26 +302,11 @@ namespace Hotline.KnowledgeBase
             if (knowledge == null)
                 throw new UserFriendlyException($"知识查询失败");
 
-            KnowledgeSendDto knowledgeSendDto = new()
-            {
-                CategoryCode = knowledge.HotspotType.ProvinceCode,
-                CategoryName = knowledge.HotspotType.HotSpotName,
-                PublishPerson = knowledge.User.Name,
-                OuName = knowledge.SystemOrganize.OrgName,
-                KName = knowledge.Title,
-                KContent = knowledge.Content,
-                CreatDate = knowledge.CreationTime,
-                BeginDate = DateTime.Now,
-                DisableDate = knowledge.ExpiredTime,
-                UID = knowledge.Code,
-                AreaCode = "",
-            };
-
             workFlow.HandleTime = DateTime.Now;
             workFlow.WorkFlowApplyStatus = EKnowledgeWorkFlowStatus.Success;
             await _knowledgeWorkFlowRepository.UpdateAsync(workFlow, cancellationToken);
 
-            string isSendType = "";//新增0，修改1，删除2
+            string isSendType = "";//推送类别：新增0，修改1，删除2
 
             switch (workflow.ModuleCode)
             {
@@ -366,6 +351,24 @@ namespace Hotline.KnowledgeBase
                     break;
             }
 
+            #region 省数据推送
+            //组装省推送数据
+            KnowledgeSendDto knowledgeSendDto = new()
+            {
+                CategoryCode = knowledge.HotspotType.ProvinceCode,
+                CategoryName = knowledge.HotspotType.HotSpotName,
+                PublishPerson = knowledge.User.Name,
+                OuName = knowledge.SystemOrganize.OrgName,
+                KName = knowledge.Title,
+                KContent = knowledge.Content,
+                CreatDate = knowledge.OnShelfTime,
+                BeginDate = knowledge.OnShelfTime,
+                DisableDate = knowledge.ExpiredTime,
+                UID = knowledge.Code,
+                AreaCode = "",
+            };
+
+            //推送
             if (isSendType == "0")  //新增知识推送
 
                 await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoSend, knowledgeSendDto, cancellationToken: cancellationToken);
@@ -374,8 +377,8 @@ namespace Hotline.KnowledgeBase
                 await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoUpdate, knowledgeSendDto, cancellationToken: cancellationToken);
             else if (isSendType == "2")   //删除知识推送
 
-                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoAbandon, knowledgeSendDto, cancellationToken: cancellationToken);
+                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoAbandon, knowledgeSendDto, cancellationToken: cancellationToken); 
+            #endregion
         }
-
     }
 }