From 2ac83445ca4e40ef45232d61817a50a37cac87fe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 25 Aug 2022 14:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=B1=85=E6=B0=91=E5=8F=91=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partyOrg/service/impl/IcPartyActServiceImpl.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index b7a14504a5..ce83d012f2 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -215,6 +215,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             if(NumConstant.ZERO==formDTO.getAutoPublicType()){
                 //选择立即发布，状态：已发布
                 icPartyActEntity.setIsPublish(NumConstant.ONE_STR);
+                //立即发布的需要发送消息
+                sendMsg=true;
             }else{
                 icPartyActEntity.setIsPublish(NumConstant.ZERO_STR);
             }
@@ -248,7 +250,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         }
 
         //已经发布的活动+且活动未开始的，编辑后需要发消息
-        if (sendMsg && icPartyActEntity.getHoldTime().compareTo(new Date()) < 1) {
+        boolean flag=icPartyActEntity.getHoldTime().compareTo(new Date()) >0;
+        if (sendMsg && flag) {
             PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
             msg.setCustomerId(formDTO.getCustomerId());
             msg.setIcPartyActId(icPartyActEntity.getId());
@@ -650,7 +653,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         icPartyActEntity.setUpdatedBy(userId);
         baseDao.updateById(icPartyActEntity);
         //发送消息：自动通知参加人员+活动未开始的
-        if (NumConstant.ONE_STR.equals(icPartyActEntity.getIsAutoInform()) && icPartyActEntity.getHoldTime().compareTo(new Date()) < 1) {
+        if (NumConstant.ONE_STR.equals(icPartyActEntity.getIsAutoInform()) && icPartyActEntity.getHoldTime().compareTo(new Date()) >0) {
             PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
             msg.setCustomerId(icPartyActEntity.getCustomerId());
             msg.setIcPartyActId(icPartyActEntity.getId());