From 6eee1d6e421eda740e391fcdba28f2e1d0739c61 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Aug 2022 16:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=86=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8F=82=E5=8A=A0=E4=BA=BA=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E6=89=8D=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPartyActServiceImpl.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 52fe2d99e4..7a3595e618 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
@@ -186,7 +186,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             icPartyActEntity.setIsPublish(origin.getIsPublish());
             baseDao.updateById(icPartyActEntity);
             //已发布，在编辑的时候，需要发送消息
-            if(NumConstant.ONE_STR.equals(icPartyActEntity.getIsPublish())){
+            if(NumConstant.ONE_STR.equals(icPartyActEntity.getIsPublish())&&NumConstant.ONE_STR.equals(icPartyActEntity.getIsAutoInform())){
                 sendMsg=true;
             }
         }else{
@@ -615,11 +615,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         icPartyActEntity.setUpdatedBy(userId);
         baseDao.updateById(icPartyActEntity);
         //发送消息
-        PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
-        msg.setCustomerId(icPartyActEntity.getCustomerId());
-        msg.setIcPartyActId(icPartyActEntity.getId());
-        msg.setType("publish");
-        SendMqMsgUtil.build().openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)).sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg);
+        if(NumConstant.ONE_STR.equals(icPartyActEntity.getIsAutoInform())){
+            PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
+            msg.setCustomerId(icPartyActEntity.getCustomerId());
+            msg.setIcPartyActId(icPartyActEntity.getId());
+            msg.setType("publish");
+            SendMqMsgUtil.build().openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)).sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg);
+        }
     }
 
     /**
@@ -661,6 +663,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     @Override
     public void noticePartyActAutoPublishTask() {
         //todo
+
         return;
     }