From baa6f4e889d0bd654f4b0c21a6dd28c150b54a73 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 11 八月 2023 17:08:33 +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 | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 d3a16ac..1e5049a 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
@@ -1320,7 +1320,7 @@
}
}
}
-
+ Map mapData = new HashMap<>();
for (int i = 0, n = propertyDescriptors.length; i <n ; i++) {
PropertyDescriptor descriptor = propertyDescriptors[i];
String propertyName = descriptor.getName();
@@ -1332,16 +1332,7 @@
if (result != null) {
if ("data".equals(propertyName)){
- 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));
- }
- }
- }
+ 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);
}
@@ -1350,6 +1341,17 @@
}
}
}
+ //浣滅敤涓昏鐢ㄤ簬宸睲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));
+ }
+ }
+ }
return returnMap;
}
--
Gitblit v1.9.3