From b7082c0eb4c79ab46047b2d79a0942b777d53ff9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 二月 2022 16:49:26 +0800
Subject: [PATCH] fix 修复 R 参数位置错误
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 26e00df..611cb15 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
@@ -1,6 +1,6 @@
package com.ruoyi.common.core.controller;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
@@ -15,29 +15,29 @@
/**
* 杩斿洖鎴愬姛
*/
- public AjaxResult<Void> success() {
- return AjaxResult.success();
+ public R<Void> success() {
+ return R.ok();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult<Void> error() {
- return AjaxResult.error();
+ public R<Void> error() {
+ return R.fail();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult<Void> success(String message) {
- return AjaxResult.success(message);
+ public R<Void> success(String message) {
+ return R.ok(message);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult<Void> error(String message) {
- return AjaxResult.error(message);
+ public R<Void> error(String message) {
+ return R.fail(message);
}
/**
@@ -46,8 +46,8 @@
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult<Void> toAjax(int rows) {
- return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+ protected R<Void> toAjax(int rows) {
+ return rows > 0 ? R.ok() : R.fail();
}
/**
@@ -56,7 +56,7 @@
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult<Void> toAjax(boolean result) {
+ protected R<Void> toAjax(boolean result) {
return result ? success() : error();
}
--
Gitblit v1.9.3