From b82fa6534bcef3e20a05d6d030e1a3035aab361d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 四月 2021 16:12:09 +0800
Subject: [PATCH] add 添加多模块分支
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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 ebf2376..516d102 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
@@ -65,9 +65,9 @@
* 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- protected TableDataInfo getDataTable(List<?> list)
+ protected <T> TableDataInfo<T> getDataTable(List<T> list)
{
- TableDataInfo rspData = new TableDataInfo();
+ TableDataInfo<T> rspData = new TableDataInfo();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("鏌ヨ鎴愬姛");
rspData.setRows(list);
@@ -81,7 +81,7 @@
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(int rows)
+ protected AjaxResult<Void> toAjax(int rows)
{
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
@@ -92,7 +92,7 @@
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(boolean result)
+ protected AjaxResult<Void> toAjax(boolean result)
{
return result ? success() : error();
}
@@ -100,7 +100,7 @@
/**
* 杩斿洖鎴愬姛
*/
- public AjaxResult success()
+ public AjaxResult<Void> success()
{
return AjaxResult.success();
}
@@ -108,7 +108,7 @@
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error()
+ public AjaxResult<Void> error()
{
return AjaxResult.error();
}
@@ -116,7 +116,7 @@
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(String message)
+ public AjaxResult<Void> success(String message)
{
return AjaxResult.success(message);
}
@@ -124,7 +124,7 @@
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error(String message)
+ public AjaxResult<Void> error(String message)
{
return AjaxResult.error(message);
}
--
Gitblit v1.9.3