From 8786aa3c324da6d6b4a74d8ade0f05b82d1aa1a4 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Wed, 23 Oct 2019 10:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/mybatis/interceptor/DataFilterInterceptor.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/interceptor/DataFilterInterceptor.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/interceptor/DataFilterInterceptor.java
index e8879fca1..eca792214 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/interceptor/DataFilterInterceptor.java
+++ b/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();