From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/framework/web/controller/BaseController.java | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 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 5b8fabc..3edde93 100644
--- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -16,7 +16,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.PageDomain;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport;
@@ -93,53 +93,69 @@
/**
* 杩斿洖鎴愬姛
*/
- public AjaxResult success()
+ public R<?> success()
{
- return AjaxResult.success();
- }
-
- /**
- * 杩斿洖澶辫触娑堟伅
- */
- public AjaxResult error()
- {
- return AjaxResult.error();
+ return R.ok();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(String message)
+ public R<?> success(String message)
{
- return AjaxResult.success(message);
+ return R.ok(null, message);
+ }
+
+ /**
+ * 杩斿洖鎴愬姛娑堟伅
+ */
+ public R<?> success(Object data)
+ {
+ return R.ok(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error(String message)
+ public R<?> error()
{
- return AjaxResult.error(message);
+ return R.fail();
+ }
+
+ /**
+ * 杩斿洖澶辫触娑堟伅
+ */
+ public R<?> error(String message)
+ {
+ return R.fail(message);
+ }
+
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ */
+ public R<?> warn(String message)
+ {
+ return R.fail(HttpStatus.WARN, message);
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(int rows)
+ protected R<?> toAjax(int rows)
{
- return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+ return rows > 0 ? R.ok() : R.fail();
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(boolean result)
+ protected R<?> toAjax(boolean result)
{
return result ? success() : error();
}
@@ -163,9 +179,9 @@
/**
* 鑾峰彇鐧诲綍閮ㄩ棬id
*/
- public Long getDeptId()
+ public Long [] getDeptId()
{
- return getLoginUser().getDeptId();
+ return getLoginUser().getDeptIds();
}
/**
--
Gitblit v1.9.3