Merge remote-tracking branch 'origin/master'

src/main/java/com/bowintek/practice/services/impl/GenSqlStringServiceImpl.java

@@ -178,11 +178,11 @@ public class GenSqlStringServiceImpl implements GenSqlStringService {
 
 
         String mainSqlString = MessageFormat.format("SELECT {0} \nFROM {1} AS T {2} \nWHERE 1=1 {3} \nGROUP BY {4} \n{5} \n{6}",
-                colString, data.sub.getExecSql(), leftTableString, whereString, groupString, orderByString, limitString);
+                colString, data.sub.getTabCode(), leftTableString, whereString, groupString, orderByString, limitString);
         result.setMainSqlString(mainSqlString);
 
         String countSqlString = MessageFormat.format("SELECT COUNT(*) CNT FROM (SELECT {0} \nFROM {1} AS T {2} \nWHERE 1=1 {3} \nGROUP BY {4})",
-                colString, data.sub.getExecSql(), leftTableString, whereString, groupString);
+                colString, data.sub.getTabCode(), leftTableString, whereString, groupString);
         result.setCountSqlStrimg(countSqlString);
 
         System.out.println(mainSqlString);