告警邮箱跟随

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/RunRecordingAndJobTaskServiceImpl.java

@@ -107,8 +107,8 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                 .flowStatus("2")
                 .flowTimeout(virFlow.getFlowTimeout())
                 .dispatchIp(InetAddress.getLocalHost().getHostAddress())
-                .alarmEmail(virFlow.getAlarmEmail())
-                .alarmlAction(virFlow.getAlarmlAction())
+                .alarmEmail(mainRecording.getAlarmEmail())
+                .alarmlAction(mainRecording.getAlarmlAction())
                 .priority(virFlow.getPriority())
                 .triggerTime(equals?jobTask.getTriggerTime():virFlow.getTriggerNextTime())
                 .principal(virFlow.getPrincipal())

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/TaskAndLogServerImpl.java

@@ -96,6 +96,7 @@ public class TaskAndLogServerImpl implements TaskAndLogServer {
         jobTaskRunLogService.saveJobTaskRunLog(jobTaskRunLog);
 
         if (isInner) {
+            RunRecording mainRecording = runRecordingService.findRunRecordingByFlowIdAndRunId(jobTask.getFlowId(), jobTask.getRunId());
             log.error("------该节点是虚节点，先将该节点对应的实例保存--------");
             //查询该节点对应的工作流
             Integer mapFlowId = jobTask.getMapFlowId();
@@ -110,8 +111,8 @@ public class TaskAndLogServerImpl implements TaskAndLogServer {
                     .flowRunResult("2")
                     .flowTimeout(virFlow.getFlowTimeout())
                     .dispatchIp(InetAddress.getLocalHost().getHostAddress())
-                    .alarmEmail(virFlow.getAlarmEmail())
-                    .alarmlAction(virFlow.getAlarmlAction())
+                    .alarmEmail(mainRecording.getAlarmEmail())
+                    .alarmlAction(mainRecording.getAlarmlAction())
                     .priority(virFlow.getPriority())
                     .triggerTime(jobTask.getTriggerTime())
                     .principal(virFlow.getPrincipal())