From d75d28e4985ff384a5f4279fd2490e13bc209ab2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 17 Jun 2026 07:07:48 +0000
Subject: [PATCH] Fix NPE in XxlJobLogDTO when triggerTime or handleTime is
 null

---
 .../com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java
index 35fb2946..0ae4e5e5 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java
@@ -40,10 +40,10 @@ public class XxlJobLogDTO {
         this.executorParam = xxlJobLog.getExecutorParam();
         this.executorShardingParam = xxlJobLog.getExecutorShardingParam();
         this.executorFailRetryCount = xxlJobLog.getExecutorFailRetryCount();
-        this.triggerTime = DateTool.formatDateTime(xxlJobLog.getTriggerTime());
+        this.triggerTime = xxlJobLog.getTriggerTime() != null ? DateTool.formatDateTime(xxlJobLog.getTriggerTime()) : null;
         this.triggerCode = xxlJobLog.getTriggerCode();
         this.triggerMsg = xxlJobLog.getTriggerMsg();
-        this.handleTime = DateTool.formatDateTime(xxlJobLog.getHandleTime());
+        this.handleTime = xxlJobLog.getHandleTime() != null ? DateTool.formatDateTime(xxlJobLog.getHandleTime()) : null;
         this.handleCode = xxlJobLog.getHandleCode();
         this.handleMsg = xxlJobLog.getHandleMsg();
         this.alarmStatus = xxlJobLog.getAlarmStatus();