yuxc
2023-08-13 94ebac05e5394173de5eac99a2bc87f7a82fd06f
1、处理basemodel与dataMap里面大小写不一致问题。
已修改1个文件
16 ■■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;