From 3f2b778ab3fbee3d851ed7033451cc008366ab4b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 13:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
index bada2f7..032fd35 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
@@ -9,13 +9,13 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Created by vincent on 1/30/2024
*/
public class BaseController {
-
public User getLoginUser() {
try {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -42,6 +42,13 @@
}
public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
+ if (!Objects.isNull(map.get("meta"))) {
+ Map<String, Object> meta = (Map<String, Object>) map.get("meta");
+ meta.keySet().forEach(key -> {
+ map.put(key, meta.get(key));
+ });
+ map.remove("meta");
+ }
T t = null;
try {
t = clz.getDeclaredConstructor().newInstance();
--
Gitblit v1.9.1