From cbe903c4c4493715ad8d307107fb95975acfc975 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 16:14:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 9a82487..598c620 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
@@ -96,12 +96,21 @@
rspData.setTotal(total);
return rspData;
}
- protected Map<String,Object> getDataTable3(long total, List<?> list) {
- Map<String,Object> rspData = new TreeMap<>();
- rspData.put("code",HttpStatus.SUCCESS);
- rspData.put("msg","鏌ヨ鎴愬姛");
- rspData.put("rows",list);
- rspData.put("total",total);
+
+ protected Map<String, Object> getDataTable3(long total, Object object) {
+ Map<String, Object> rspData = new TreeMap<>();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("rows", object);
+ rspData.put("total", total);
+ return rspData;
+ }
+ protected Map<String, Object> getDataTable4(long total, Object object) {
+ Map<String, Object> rspData = new TreeMap<>();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("data", object);
+ rspData.put("total", total);
return rspData;
}
@@ -201,6 +210,7 @@
public String getUsername() {
return getLoginUser().getUsername();
}
+
/**
* 鑾峰彇鏈烘瀯ID
*/
--
Gitblit v1.9.3