From ab01a0f611c0adb97662bc8f548ca4a911ec8045 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:37:39 +0800
Subject: [PATCH] 分页修改
---
src/main/java/com/ruoyi/framework/web/controller/BaseController.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
index 27baf0e..5c6fe3e 100644
--- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -11,6 +11,7 @@
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
@@ -51,15 +52,7 @@
*/
protected void startPage()
{
- PageDomain pageDomain = TableSupport.buildPageRequest();
- Integer pageNum = pageDomain.getPageNum();
- Integer pageSize = pageDomain.getPageSize();
- if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
- {
- String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- Boolean reasonable = pageDomain.getReasonable();
- PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
- }
+ PageUtils.startPage();
}
/**
@@ -73,6 +66,14 @@
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.orderBy(orderBy);
}
+ }
+
+ /**
+ * 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲�
+ */
+ protected void clearPage()
+ {
+ PageUtils.clearPage();
}
/**
@@ -98,14 +99,6 @@
}
/**
- * 杩斿洖澶辫触娑堟伅
- */
- public AjaxResult error()
- {
- return AjaxResult.error();
- }
-
- /**
* 杩斿洖鎴愬姛娑堟伅
*/
public AjaxResult success(String message)
@@ -114,11 +107,35 @@
}
/**
+ * 杩斿洖鎴愬姛娑堟伅
+ */
+ public AjaxResult success(Object data)
+ {
+ return AjaxResult.success(data);
+ }
+
+ /**
+ * 杩斿洖澶辫触娑堟伅
+ */
+ public AjaxResult error()
+ {
+ return AjaxResult.error();
+ }
+
+ /**
* 杩斿洖澶辫触娑堟伅
*/
public AjaxResult error(String message)
{
return AjaxResult.error(message);
+ }
+
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ */
+ public AjaxResult warn(String message)
+ {
+ return AjaxResult.warn(message);
}
/**
@@ -162,9 +179,9 @@
/**
* 鑾峰彇鐧诲綍閮ㄩ棬id
*/
- public Long getDeptId()
+ public Long [] getDeptId()
{
- return getLoginUser().getDeptId();
+ return getLoginUser().getDeptIds();
}
/**
--
Gitblit v1.9.3