From 760b4f0509bbdc0605ea51060f4b844b315b625f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 15:45:42 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 bcb9262..ed14ec0 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,10 +9,12 @@
 
 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() {
@@ -41,6 +43,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