diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/slf4j/Slf4jLog.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/slf4j/Slf4jLog.java
index 77db56bdd..3720082f8 100644
--- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/slf4j/Slf4jLog.java
+++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/slf4j/Slf4jLog.java
@@ -213,9 +213,7 @@ public class Slf4jLog extends AbstractLog {
      */
     private void setContextMap(Boolean remote) {
         if (remote) {
-            Map<String, String> map = new LinkedHashMap<>();
-            map.put(LogFieldConstants.MDC_REMOTE, remote.toString());
-            MDC.setContextMap(map);
+            MDC.put(LogFieldConstants.MDC_REMOTE, remote.toString());
         }
     }
 }
diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java
index cd2465533..6c47b6d35 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java
@@ -126,7 +126,7 @@ public class JobExecutorActor extends AbstractActor {
             }
 
             // 无客户端节点-告警通知
-            if (JobTaskBatchStatusEnum.CANCEL.getStatus() == taskStatus && JobOperationReasonEnum.NOT_CLIENT.getReason() == operationReason) {
+            if (CollUtil.isEmpty(CacheRegisterTable.getServerNodeSet(job.getGroupName(), job.getNamespaceId()))) {
                 SnailSpringContext.getContext().publishEvent(
                         new JobTaskFailAlarmEvent(JobTaskFailAlarmEventDTO.builder()
                                 .jobTaskBatchId(taskExecute.getTaskBatchId())
@@ -148,7 +148,7 @@ public class JobExecutorActor extends AbstractActor {
             JobTaskGenerator taskInstance = JobTaskGeneratorFactory.getTaskInstance(job.getTaskType());
             JobTaskGenerateContext instanceGenerateContext = JobTaskConverter.INSTANCE.toJobTaskInstanceGenerateContext(job);
             instanceGenerateContext.setTaskBatchId(taskExecute.getTaskBatchId());
-            if (Objects.nonNull(taskExecute.getTmpArgsStr())){
+            if (Objects.nonNull(taskExecute.getTmpArgsStr())) {
                 instanceGenerateContext.setArgsStr(taskExecute.getTmpArgsStr());
             }
             if (Lists.newArrayList(MAP_REDUCE.getType(), MAP.getType()).contains(job.getTaskType())) {
diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
index df1f2d6b2..c16ff70e6 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
@@ -92,6 +92,7 @@ public class JobTaskBatchGenerator {
                             .reason(JobNotifySceneEnum.JOB_NO_CLIENT_NODES_ERROR.getDesc())
                             .notifyScene(JobNotifySceneEnum.JOB_NO_CLIENT_NODES_ERROR.getNotifyScene())
                             .build()));
+            return jobTaskBatch;
         }
 
         // 非待处理状态无需进入时间轮中
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailAlarmListener.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailAlarmListener.java
index 5ad31bf0e..ddb83e0ba 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailAlarmListener.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailAlarmListener.java
@@ -95,7 +95,7 @@ public class RetryTaskFailAlarmListener extends
                         retryAlarmInfo.getExecutorName(),
                         retryAlarmInfo.getSceneName(),
                         retryAlarmInfo.getArgsStr(),
-                        DateUtils.format(retryAlarmInfo.getCreateDt(), DateUtils.NORM_DATETIME_PATTERN),
+                        DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN),
                         retryAlarmInfo.getReason())
                 .title("组:[{}] 场景:[{}] 环境重试任务失败",
                         retryAlarmInfo.getGroupName(), retryAlarmInfo.getSceneName());
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
index e6db67bf4..26f02032d 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
@@ -87,7 +87,7 @@ public class RetryTaskFailDeadLetterAlarmListener extends
                         retryAlarmInfo.getExecutorName(),
                         retryAlarmInfo.getSceneName(),
                         retryAlarmInfo.getArgsStr(),
-                        DateUtils.format(retryAlarmInfo.getCreateDt(), DateUtils.NORM_DATETIME_PATTERN))
+                        DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN))
                 .title("组:[{}] 场景:[{}] 环境重试任务失败进入死信队列",
                         retryAlarmInfo.getGroupName(), retryAlarmInfo.getSceneName());
     }