Commit 385b6c66 by 陶光胜

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
parents e8e2e515 da4d9e47
...@@ -208,9 +208,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -208,9 +208,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
// 最终处理 SQL // 最终处理 SQL
String queryFull = "SELECT " + queryDistinct + queryColumns + " FROM " + tableId + " " + queryFilters ; String queryFull = "SELECT " + queryDistinct + queryColumns + " FROM " + tableId + " " + queryFilters ;
if(queryOrDownload){ if(queryOrDownload){
queryFull+= " " + queryOrder + " "; queryFull+= " " + queryOrder + " " +queryDir +" ";
} }
queryFull+= queryDir + queryLimit; queryFull+= queryLimit;
log.debug("buildFlatQuerySQL","生成自助指标查询SQL:" + queryFull); log.debug("buildFlatQuerySQL","生成自助指标查询SQL:" + queryFull);
return queryFull; return queryFull;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment