Merge pull request #3974 from xuxueli/copilot/fix-logging-error-in-v341

Fix NPE when viewing job logs with null triggerTime or handleTime
copilot/fix-issue-3921
许雪里 3 months ago committed by GitHub
commit af48317887
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -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();

Loading…
Cancel
Save