Merge remote-tracking branch 'remotes/origin/developer'

# Conflicts:
#	gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java

@@ -208,9 +208,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		// 最终处理 SQL
 		String queryFull = "SELECT " + queryDistinct + queryColumns + " FROM " + tableId + " " + queryFilters ;
 		if(queryOrDownload){
-			queryFull+= " " + queryOrder + " ";
+			queryFull+= " " + queryOrder + " " +queryDir  +" ";
 		}
-		queryFull+= queryDir + queryLimit;
+		queryFull+=  queryLimit;
 		log.debug("buildFlatQuerySQL","生成自助指标查询SQL：" + queryFull);
 		return queryFull;
 	}