From 258ff0cb6c2b4fbc3c8b9a6036c17e2efad00ac1 Mon Sep 17 00:00:00 2001
From: lidongdai <escheduler@outlook.com>
Date: Thu, 4 Jul 2019 19:29:59 +0800
Subject: [PATCH] update SqlTask

---
 .../src/main/java/cn/escheduler/dao/ProcessDao.java           | 1 +
 escheduler-server/pom.xml                                     | 4 ----
 .../java/cn/escheduler/server/worker/task/sql/SqlTask.java    | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
index 0d5af285c3..056904281a 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
@@ -1693,6 +1693,7 @@ public class ProcessDao extends AbstractBaseDao {
         ProcessInstance processInstance = findProcessInstanceByTaskId(taskInstance.getId());
         if(processInstance == null){
             logger.error("cannot find the task:{} process instance", taskInstance.getId());
+            return Constants.DEFAULT_WORKER_ID;
         }
         int processWorkerGroupId = processInstance.getWorkerGroupId();
 
diff --git a/escheduler-server/pom.xml b/escheduler-server/pom.xml
index 657633c80b..6341539e4c 100644
--- a/escheduler-server/pom.xml
+++ b/escheduler-server/pom.xml
@@ -88,10 +88,6 @@
 			<groupId>cn.analysys</groupId>
 			<artifactId>escheduler-alert</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>cn.analysys</groupId>
-            <artifactId>escheduler-api</artifactId>
-        </dependency>
 
     </dependencies>
 
diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java b/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java
index 4eb567d8c8..f013771bc0 100644
--- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java
+++ b/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java
@@ -374,7 +374,7 @@ public class SqlTask extends AbstractTask {
         String showTypeName = sqlParameters.getShowType().replace(Constants.COMMA,"").trim();
         if(EnumUtils.isValidEnum(ShowType.class,showTypeName)){
             Map<String, Object> mailResult = MailUtils.sendMails(receviersList, receviersCcList, title, content, ShowType.valueOf(showTypeName));
-            if(!(Boolean) mailResult.get(cn.escheduler.api.utils.Constants.STATUS)){
+            if(!(Boolean) mailResult.get(cn.escheduler.common.Constants.STATUS)){
                 throw new RuntimeException("send mail failed!");
             }
         }else{