From ded6e8d2312e139e8ce770c7f1d5830bf2db4af6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 11:39:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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..7bf46f2 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,7 +1332,16 @@
 
 				if (result != null) {
 					if ("data".equals(propertyName)){
-						returnMap.putAll((Map) result);
+						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 {
 						returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
 					}

--
Gitblit v1.9.3