Merge branch 'dev' into fix_job_instance_in_query_mode

# Conflicts: # dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java
DataLinkDC · Oct 18, 2024 · 649c6ba · 649c6ba
2 parents 0416592 + 202a13e
commit 649c6ba
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java b/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java
@@ -180,21 +180,19 @@ public boolean success() {
         history.setClusterId(clusterId);
         historyService.updateById(history);
 
-        if (!job.getJobConfig().isStatementSet()) {
-            return true;
-        }
-
-        if (Asserts.isNullCollection(job.getJids()) || Asserts.isNullString(job.getJobManagerAddress())) {
+        if (job.getJobConfig().isStatementSet()
+                && (Asserts.isNullCollection(job.getJids()) || Asserts.isNullString(job.getJobManagerAddress()))) {
             throw new BusException("The JobID or JobManagerAddress is null. ");
         }
 
-        String jid = job.getJids().get(0);
         JobInstance jobInstance = history.buildJobInstance();
         jobInstance.setHistoryId(job.getId());
         jobInstance.setClusterId(clusterId);
         jobInstance.setTaskId(taskId);
         jobInstance.setName(job.getJobConfig().getJobName());
-        jobInstance.setJid(jid);
+        if (Asserts.isNotNullCollection(job.getJids())) {
+            jobInstance.setJid(job.getJids().get(0));
+        }
         jobInstance.setStep(job.getJobConfig().getStep());
         jobInstance.setStatus(JobStatus.INITIALIZING.getValue());
         jobInstanceService.save(jobInstance);