From 73de15331cb383949ae5adc230b208a04d987b37 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 14:23:43 +0800
Subject: [PATCH] Merge branch 'devlop-phyz' of http://47.97.1.152:5880/r/wms-master into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java | 17 ++++++++++++++++-
1 files changed, 16 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..23d1a98 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,21 @@
}
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");
+ }
+ // 绉婚櫎绛涢�夋潯浠堕噷闈㈢殑 $
+ for (String key : map.keySet()) {
+ Object value = map.get(key);
+ if (key.equals("orderBy")) {
+ String newValue = value.toString().replace("$", "");
+ map.replace("orderBy", value, newValue);
+ }
+ }
T t = null;
try {
t = clz.getDeclaredConstructor().newInstance();
--
Gitblit v1.9.1