diff --git a/backend/app/service/backup.go b/backend/app/service/backup.go index 169d4276b..0e06c80e7 100644 --- a/backend/app/service/backup.go +++ b/backend/app/service/backup.go @@ -475,6 +475,8 @@ func (u *BackupService) loadRecordSize(records []model.BackupRecord) ([]dto.Back datas = append(datas, item) wg.Done() }(i) + } else { + datas = append(datas, item) } } wg.Wait() diff --git a/backend/init/migration/migrations/v_1_9.go b/backend/init/migration/migrations/v_1_9.go index 00c1bc3c5..5c21f4872 100644 --- a/backend/init/migration/migrations/v_1_9.go +++ b/backend/init/migration/migrations/v_1_9.go @@ -314,7 +314,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{ } var records []model.JobRecords - _ = tx.Where("cronjob_id = ?", job.ID).Find(&records).Error + _ = tx.Where("cronjob_id = ? AND status = ?", job.ID, constant.StatusSuccess).Find(&records).Error for _, record := range records { if job.Type == "snapshot" { var snaps []model.Snapshot @@ -329,6 +329,9 @@ var UpdateCronjobSpec = &gormigrate.Migration{ FileName: snap.Name + ".tar.gz", Source: snap.From, BackupType: snap.From, + BaseModel: model.BaseModel{ + CreatedAt: job.CreatedAt, + }, } _ = tx.Create(&item).Error } @@ -344,6 +347,9 @@ var UpdateCronjobSpec = &gormigrate.Migration{ FileName: path.Base(record.File), Source: mapAccount[uint(job.TargetDirID)].Type, BackupType: mapAccount[uint(job.TargetDirID)].Type, + BaseModel: model.BaseModel{ + CreatedAt: job.CreatedAt, + }, } _ = tx.Create(&item).Error continue @@ -357,6 +363,9 @@ var UpdateCronjobSpec = &gormigrate.Migration{ FileDir: path.Dir(strings.TrimPrefix(record.File, itemPath)), FileName: path.Base(record.File), BackupType: mapAccount[uint(job.TargetDirID)].Type, + BaseModel: model.BaseModel{ + CreatedAt: job.CreatedAt, + }, } if record.FromLocal { item.Source = constant.Local