From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
index e1037a1..367f7e0 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
@@ -33,7 +33,6 @@
import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletRequest;
-import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.*;
import java.math.BigDecimal;
@@ -147,9 +146,23 @@
* @param beanClass Bean鐨勭被
* @return 浠庡垪琛ㄩ噷鑾峰彇绗竴涓璞�
*/
- public static <T> T getFirstObjectFromJson(String jsonString,Class<T> beanClass){
+ public static <T> T getFirstObjectFromJsonArray(String jsonString,Class<T> beanClass){
if(!isNull(jsonString)) {
return JSONObject.parseArray(jsonString, beanClass).get(0);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * 浠巎son瀛楃涓蹭腑鑾峰彇绗竴涓璞�
+ * @param jsonString json鐨勫瓧绗︿覆
+ * @param beanClass Bean鐨勭被
+ * @return 浠庡垪琛ㄩ噷鑾峰彇绗竴涓璞�
+ */
+ public static <T> List<T> getObjectListFromJsonArray(String jsonString,Class<T> beanClass){
+ if(!isNull(jsonString)) {
+ return JSONObject.parseArray(jsonString, beanClass);
} else {
return null;
}
@@ -1176,7 +1189,10 @@
}else{
fieldValue = getStringValueFromObject(value);
}
- setValueForFieldFromCbo(fieldAttrMap.get(field.getName().toLowerCase()), obj, fieldValue);
+ String fieldName = fieldAttrMap.get(field.getName().toLowerCase());
+ if(StringUtils.isNotBlank(fieldName)){
+ setValueForFieldFromCbo(fieldName, obj, fieldValue);
+ }
}
}
}
@@ -1619,7 +1635,7 @@
* @return base寮傚父瀵硅薄
*/
public static VciBaseException getVciBaseException(PLException e){
- return new VciBaseException(e.code, new java.lang.String[]{e.getMessage()});
+ return new VciBaseException(e.code, new String[]{e.getMessage()});
}
/**
--
Gitblit v1.9.3