From a598f579e21d4dcc30b5d8fa1737f24f4dd90012 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 七月 2023 17:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index 4a08af9..d3a16ac 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -1294,7 +1294,7 @@
* @return Map瀵硅薄
* @version 2016骞�3鏈�20鏃� 11:03:01
*/
- public static Map convertBean2Map(Object bean) throws Exception {
+ public static Map convertBean2Map(Object bean,Set<String> existFild) throws Exception {
Class type = bean.getClass();
Map returnMap = new HashMap();
BeanInfo beanInfo = Introspector.getBeanInfo(type);
@@ -1332,11 +1332,20 @@
if (result != null) {
if ("data".equals(propertyName)){
- returnMap.putAll((Map) result);
- }else {
+ if(existFild == null){
+ returnMap.putAll((Map) result);
+ }else{
+ Map resulMap = (Map) result;
+ for (Object o : resulMap.keySet()) {
+ if(existFild.contains(o)){
+ returnMap.put(o,resulMap.get(o));
+ }
+ }
+ }
+ }else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
}
- } else {
+ } else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
}
}
--
Gitblit v1.9.3