diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java index 98a693f6c3..550be8e02b 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java @@ -511,10 +511,10 @@ public boolean changeTaskLifeRecyle(Integer taskId, JobLifeCycle lifeCycle) thro boolean saved = saveOrUpdate(task.buildTask()); if (saved && Asserts.isNotNull(task.getJobInstanceId())) { JobInstance jobInstance = jobInstanceService.getById(task.getJobInstanceId()); - jobInstance.setStep(lifeCycle.getValue()); - boolean updatedJobInstance = jobInstanceService.updateById(jobInstance); - if (updatedJobInstance) { - jobInstanceService.refreshJobInfoDetail(jobInstance.getId(), true); + if (Asserts.isNotNull(jobInstance)) { + jobInstance.setStep(lifeCycle.getValue()); + boolean updatedJobInstance = jobInstanceService.updateById(jobInstance); + if (updatedJobInstance) jobInstanceService.refreshJobInfoDetail(jobInstance.getId(), true); log.warn( "JobInstance [{}] step change to [{}] ,Trigger Force Refresh", jobInstance.getName(), diff --git a/dinky-web/src/pages/DataStudio/LeftContainer/Project/function.tsx b/dinky-web/src/pages/DataStudio/LeftContainer/Project/function.tsx index e3d76a29a8..36b02ad10f 100644 --- a/dinky-web/src/pages/DataStudio/LeftContainer/Project/function.tsx +++ b/dinky-web/src/pages/DataStudio/LeftContainer/Project/function.tsx @@ -80,19 +80,19 @@ export const buildStepValue = (step: number) => { return { title: l('global.table.lifecycle.dev'), status: 'processing', - color: '#1890ff' + color: 'cyan' }; case 2: return { title: l('global.table.lifecycle.online'), status: 'success', - color: '#52c41a' + color: 'purple' }; default: return { title: l('global.table.lifecycle.dev'), status: 'default', - color: '#1890ff' + color: 'cyan' }; } }; @@ -144,7 +144,8 @@ export const buildProjectTree = ( <> );