dangsn
2023-08-02 54f35ae7866dac5c497372b68d03309c7eae9424
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -1294,13 +1294,14 @@
    * @return Map对象
    * @version 2016年3月20日 11:03:01
    */
   public static Map convertBean2Map(Object bean) throws Exception {
   public static Map convertBean2Map(Object bean,Set<String> existFild) throws Exception {
      Class type = bean.getClass();
      Map returnMap = new HashMap();
      BeanInfo beanInfo = Introspector.getBeanInfo(type);
      PropertyDescriptor[] propertyDescriptors = beanInfo
         .getPropertyDescriptors();
      Field[] declaredFields = type.getDeclaredFields();
      Map<String, String> fieldMap = new HashMap();
      String existField = "";
      for (Field declaredField : declaredFields) {
         declaredField.setAccessible(true);
@@ -1312,6 +1313,10 @@
            Boolean fieldValue = tableField.exist();
            if(fieldValue == false){
               existField += declaredField.getName().toLowerCase()+",";
            }
            String value = tableField.value();
            if(net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils.isNotBlank(value)){
               fieldMap.put(declaredField.getName(), value);
            }
         }
      }
@@ -1327,12 +1332,21 @@
            if (result != null) {
               if ("data".equals(propertyName)){
                  returnMap.putAll((Map) result);
               }else {
                  returnMap.put(propertyName, result);
                  if(existFild == null){
                     returnMap.putAll((Map) result);
                  }else{
                     Map resulMapChild = (Map) result;
                     for (Object o : resulMapChild.keySet()) {
                        if(existFild.contains(String.valueOf(o).toLowerCase())){
                           returnMap.put(String.valueOf(o).toLowerCase(),resulMapChild.get(o));
                        }
                     }
                  }
               }else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
                  returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
               }
            } else {
               returnMap.put(propertyName, "");
            } else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
               returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
            }
         }
      }