diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 2aeaf9bae69d383ec5ca5bbe88f86768ea3285d5..b96d93c0b1703988fc9f9fd3522db7aedda31bbc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -68,6 +68,14 @@ public class BaseController } } + /** + * 清理分页的线程变量 + */ + protected void clearPage() + { + PageUtils.clearPage(); + } + /** * 响应请求分页数据 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java index 7db37a2fe7331d4d9fc9921138591439c99c0644..0585396c973fda813ce98347cd1f337efb59e2ce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java @@ -27,4 +27,12 @@ public class PageUtils extends PageHelper PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); } } + + /** + * 清理分页的线程变量 + */ + public static void clearPage() + { + PageHelper.clearPage(); + } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index a2aaf22292ba4e4afbeccb2ba179a09544b466b3..c9ce32259c97cee116d482509fdb284ac8072f9f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -65,7 +65,6 @@ public class LogAspect { try { - // 获取当前的用户 LoginUser loginUser = SecurityUtils.getLoginUser();