From c7aa60c3241f306ec66fdea86f78249d742e63d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 八月 2023 09:25:38 +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 | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 ca40971..ffec7f9 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
@@ -1332,22 +1332,18 @@
if ("data".equals(propertyName)){
mapData = (Map) result;
}else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
- returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), result);
}
} else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
- returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), "");
}
}
}
//浣滅敤涓昏鐢ㄤ簬宸睲AP涓殑鏁版嵁涓哄噯锛宐ean閲岄潰閬囧埌瀛楁鐩稿悓涔熶細杩涜瑕嗙洊銆�
- if(existFild == null){
- returnMap.putAll((Map) mapData);
- }else{
- Map resulMapChild = (Map) mapData;
- for (Object o : resulMapChild.keySet()) {
- if(existFild.contains(String.valueOf(o).toLowerCase())){
- returnMap.put(String.valueOf(o).toLowerCase(),resulMapChild.get(o));
- }
+// Map resulMapChild = (Map) mapData;
+ for (Object o : mapData.keySet()) {
+ if(existFild == null || existFild.contains(String.valueOf(o).toLowerCase())){
+ returnMap.put(String.valueOf(o).toLowerCase(),mapData.get(o));
}
}
return returnMap;
--
Gitblit v1.9.3