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(), "");
            }
         }
      }
      //作用主要用于已MAP中的数据为准，bean里面遇到字段相同也会进行覆盖。
      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;