From 80999f28eeb0702e2a3866e5fcb281230cd60f95 Mon Sep 17 00:00:00 2001 From: "stonezdj(Daojun Zhang)" Date: Mon, 28 Nov 2022 14:02:30 +0800 Subject: [PATCH] Keep CheckInAt time empty when it is empty (#17877) Fixes #17860 Signed-off-by: stonezdj Signed-off-by: stonezdj --- src/server/v2.0/handler/jobservice.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/server/v2.0/handler/jobservice.go b/src/server/v2.0/handler/jobservice.go index 7025af299..cd6dd5784 100644 --- a/src/server/v2.0/handler/jobservice.go +++ b/src/server/v2.0/handler/jobservice.go @@ -86,16 +86,23 @@ func toWorkerResponse(wks []*jm.Worker) []*models.Worker { PoolID: w.PoolID, }) } else { - startAtTime := covertTime(w.StartedAt) - checkInAtTime := covertTime(w.CheckInAt) + var startAtTime, checkInAtTime *strfmt.DateTime + if w.StartedAt != 0 { + t := covertTime(w.StartedAt) + startAtTime = &t + } + if w.CheckInAt != 0 { + t := covertTime(w.CheckInAt) + checkInAtTime = &t + } workers = append(workers, &models.Worker{ ID: w.ID, JobName: w.JobName, JobID: w.JobID, PoolID: w.PoolID, Args: w.Args, - StartAt: &startAtTime, - CheckinAt: &checkInAtTime, + StartAt: startAtTime, + CheckinAt: checkInAtTime, }) } }