diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java index c5969462f0..a1857073c1 100644 --- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java +++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java @@ -591,9 +591,17 @@ public class JiraPlatform extends AbstractIssuePlatform { msDefaultValue = defaultList; } else { if (customFieldDao.getType().equals(CustomFieldType.DATE.getValue())) { - msDefaultValue = Instant.ofEpochMilli((Long) defaultValue).atZone(ZoneId.systemDefault()).toLocalDate(); + if (defaultValue instanceof String) { + msDefaultValue = defaultValue; + } else { + msDefaultValue = Instant.ofEpochMilli((Long) defaultValue).atZone(ZoneId.systemDefault()).toLocalDate(); + } } else if (customFieldDao.getType().equals(CustomFieldType.DATETIME.getValue())) { - msDefaultValue = LocalDateTime.ofInstant(Instant.ofEpochMilli((Long) defaultValue), ZoneId.systemDefault()).toString(); + if (defaultValue instanceof String) { + msDefaultValue = defaultValue; + } else { + msDefaultValue = LocalDateTime.ofInstant(Instant.ofEpochMilli((Long) defaultValue), ZoneId.systemDefault()).toString(); + } } else { msDefaultValue = defaultValue; } diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue index 71796ec8b8..b2fd6f4805 100644 --- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue +++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue @@ -11,7 +11,7 @@ + :content="schedule.enable ? $t('commons.close_schedule') : $t('commons.open_schedule')"> @@ -322,7 +322,7 @@ export default { removeGoBackListener(this.close); }, intervalShortValidate() { - if (this.getIntervalTime() < 3 * 60 * 1000) { + if (this.schedule.enable && this.getIntervalTime() < 3 * 60 * 1000) { // return false; this.$info(this.$t('schedule.cron_expression_interval_short_error')); } diff --git a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue index dd88000b21..9d383e75e9 100644 --- a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue +++ b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue @@ -17,7 +17,7 @@ + :content="schedule.enable ? $t('commons.close_schedule') : $t('commons.open_schedule')"> @@ -398,7 +398,7 @@ export default { removeGoBackListener(this.close); }, intervalShortValidate() { - if (this.getIntervalTime() < 3 * 60 * 1000) { + if (this.schedule.enable && this.getIntervalTime() < 3 * 60 * 1000) { // return false; this.$info(this.$t('schedule.cron_expression_interval_short_error')); }