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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@@ -228,6 +228,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
         actPointEventMsg.setRemark(remark);
+        actPointEventMsg.setSourceId(formDTO.getActId());
         actPointEventMsgList.add(actPointEventMsg);
 
         mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -810,6 +810,7 @@ public class WorkActServiceImpl implements WorkActService {
             basePointEventMsg.setIsCommon(true);
             basePointEventMsg.setRemark(remark);
             basePointEventMsg.setSourceId(actInfoDTO.getId());
+            basePointEventMsg.setOperatorId(loginUserUtil.getLoginUserId());
             basePointEventMsgArrayList.add(basePointEventMsg);
         }
         mqBaseMsgDTO.setMsg(JSON.toJSONString(basePointEventMsgArrayList));