fix NPE

Zzm0809 · Dec 27, 2023 · 6e232c6 · 6e232c6
1 parent 57a9acc
commit 6e232c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
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
@@ -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
@@ -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 = (
           <>
             <Badge
               title={stepValue.title}
-              status={(stepValue.status as PresetStatusColorType) ?? 'default'}
+              color={stepValue.color}
+              // status={(stepValue.status as PresetStatusColorType) ?? 'default'}
             />
           </>
         );