Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

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{
@@ -616,11 +616,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         icPartyActEntity.setUpdatedBy(userId);
         baseDao.updateById(icPartyActEntity);
         //发送消息
-        PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
+        if(NumConstant.ONE_STR.equals(icPartyActEntity.getIsAutoInform())){
-        msg.setCustomerId(icPartyActEntity.getCustomerId());
+            PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
-        msg.setIcPartyActId(icPartyActEntity.getId());
+            msg.setCustomerId(icPartyActEntity.getCustomerId());
-        msg.setType("publish");
+            msg.setIcPartyActId(icPartyActEntity.getId());
-        SendMqMsgUtil.build().openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)).sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg);
+            msg.setType("publish");
+            SendMqMsgUtil.build().openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)).sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg);
+        }
     }
 
     /**
@@ -662,6 +664,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     @Override
     public void noticePartyActAutoPublishTask() {
         //todo
+
         return;
     }