Merge branch 'dev' into dev (c56e555a) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -270,17 +270,10 @@ public class SqlTask extends AbstractTask {
		String result = JSONUtils.toJsonString(resultJSONArray);
		logger.debug("execute sql : {}", result);

		// if there is a result set
		if (!resultJSONArray.isEmpty(null) ) {
		if (StringUtils.isNotEmpty(sqlParameters.getTitle())) {
		sendAttachment(sqlParameters.getTitle(),
		JSONUtils.toJsonString(resultJSONArray));
		}else{
		sendAttachment(taskExecutionContext.getTaskName() + " query resultsets ",
		sendAttachment(StringUtils.isNotEmpty(sqlParameters.getTitle()) ?
		sqlParameters.getTitle(): taskExecutionContext.getTaskName() + " query result sets",
		JSONUtils.toJsonString(resultJSONArray));
		}
		}
		}

		/**
		* pre sql