Merge branch 'dev_newRegister' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_newRegister

esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/interceptor/DataFilterInterceptor.java

@@ -73,7 +73,10 @@ public class DataFilterInterceptor extends AbstractSqlParserHandler implements I
 
         // 拼接新SQL
         String orderBy = "ORDER BY";
-        if (originalSql.indexOf(orderBy) > -1) {
+        String groupBy = "GROUP BY";
+        if (originalSql.indexOf(groupBy) > -1) {
+            originalSql = originalSql.replace(groupBy, scope.getSqlFilter() + groupBy);
+        } else if (originalSql.indexOf(orderBy) > -1) {
             originalSql = originalSql.replace(orderBy, scope.getSqlFilter() + orderBy);
         } else {
             originalSql = originalSql + scope.getSqlFilter();