From 4187374bbae66190e7eca6f42cc5e61cfae1637f Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:18 +0800
Subject: [PATCH] PDM集成swing界面相关功能开发

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 7bf46f2..a598e4f 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
@@ -37,8 +37,6 @@
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1342,10 +1340,10 @@
 								}
 							}
 						}
-					}else {
+					}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, "");
 				}
 			}
@@ -1371,9 +1369,14 @@
 //						String sqlField = camelToUnderscore(key);
 
 
-						if (map.containsKey(key.toUpperCase())) {
+						if (map.containsKey(key.toUpperCase(Locale.ROOT))||map.containsKey(key.toLowerCase(Locale.ROOT))) {
 							try {
-								Object value = map.get(key.toUpperCase());
+								Object value="";
+								if (map.containsKey(key.toUpperCase(Locale.ROOT))) {
+									value = map.get(key.toUpperCase());
+								}else if(map.containsKey(key.toLowerCase(Locale.ROOT))){
+									value = map.get(key.toLowerCase());
+								}
 								// 寰楀埌property瀵瑰簲鐨剆etter鏂规硶
 								Method setter = property.getWriteMethod();
 								Class<?> type = property.getPropertyType();
@@ -1395,6 +1398,7 @@
 		return beanList;
 }
 
+
 	public static String camelToUnderscore(String name) {
 		if (name == null && name.length() <= 0) {
 			return name;

--
Gitblit v1.9.3