From b688b68ca70c1b601aa48b6b61526617ad398f23 Mon Sep 17 00:00:00 2001 From: yujintao Date: Mon, 9 Sep 2019 21:08:12 +0800 Subject: [PATCH] =?UTF-8?q?datafilter=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/interceptor/DataFilterInterceptor.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 49e6597e0..e8879fca1 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 @@ -1,14 +1,15 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ package com.elink.esua.epdc.commons.mybatis.interceptor; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler; import com.elink.esua.epdc.commons.mybatis.entity.DataScope; import com.elink.esua.epdc.commons.mybatis.entity.DataScope; @@ -66,12 +67,17 @@ public class DataFilterInterceptor extends AbstractSqlParserHandler implements I } // 不用数据过滤 - if(scope == null){ + if (scope == null) { return invocation.proceed(); } // 拼接新SQL - originalSql = originalSql + scope.getSqlFilter(); + String orderBy = "ORDER BY"; + if (originalSql.indexOf(orderBy) > -1) { + originalSql = originalSql.replace(orderBy, scope.getSqlFilter() + orderBy); + } else { + originalSql = originalSql + scope.getSqlFilter(); + } // 重写SQL metaObject.setValue("delegate.boundSql.sql", originalSql);