[incubator-dolphinscheduler] branch dev updated: fix #2334 (#2335)

[lidongdai]

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 4440b35  fix #2334 (#2335)
4440b35 is described below

commit 4440b35c4e1a56eeadddd4b6881ad70684350726
Author: Rubik-W <39549317+rubi...@users.noreply.github.com>
AuthorDate: Mon Mar 30 16:22:44 2020 +0800

    fix #2334 (#2335)
    
    Co-authored-by: dailidong <dailidon...@gmail.com>
---
 .../org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 12f4b58..7da6bd9 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -299,7 +299,11 @@ public class SqlTask extends AbstractTask {
                     while (resultSet.next()) {
                         JSONObject mapOfColValues = new JSONObject(true);
                         for (int i = 1; i <= num; i++) {
-                            mapOfColValues.put(md.getColumnName(i), 
resultSet.getObject(i));
+                            if (StringUtils.isNotEmpty(md.getColumnLabel(i))) {
+                                mapOfColValues.put(md.getColumnLabel(i), 
resultSet.getObject(i));
+                            } else {
+                                mapOfColValues.put(md.getColumnName(i), 
resultSet.getObject(i));
+                            }
                         }
                         resultJSONArray.add(mapOfColValues);
                     }