From 64129e1006122375d67ac6ae73f2334656c51e0a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 03 四月 2022 18:26:53 +0800
Subject: [PATCH] 修复Excel注解prompt/combo同时使用不生效问题
---
src/main/java/com/ruoyi/common/utils/PageUtils.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/PageUtils.java b/src/main/java/com/ruoyi/common/utils/PageUtils.java
index 5e92aed..5538d53 100644
--- a/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -23,7 +23,16 @@
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
{
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- PageHelper.startPage(pageNum, pageSize, orderBy);
+ Boolean reasonable = pageDomain.getReasonable();
+ PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
}
+
+ /**
+ * 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲�
+ */
+ public static void clearPage()
+ {
+ PageHelper.clearPage();
+ }
}
--
Gitblit v1.9.3