Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

the commit.

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java

@@ -1301,6 +1301,7 @@
        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);
                }
            }
        }
@@ -1329,10 +1334,10 @@
                    if ("data".equals(propertyName)){
                        returnMap.putAll((Map) result);
                    }else {
                        returnMap.put(propertyName, result);
                        returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
                    }
                } else {
                    returnMap.put(propertyName, "");
                    returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
                }
            }
        }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java

@@ -695,7 +695,7 @@
     * @return æ‰§è¡Œçš„结果
     */
    @GetMapping("/defaultReferDataGrid")
    public Page<BtmTypeVO>  defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
    public DataGrid<BaseModel>  defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
        return engineService.referDataGrid(referConfigVO,baseQueryObject);
    }


 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java

@@ -401,7 +401,7 @@
     * @param referConfigVO
     * @return
     */
    Page<BtmTypeVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject);
    DataGrid<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject);


    /**

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

ÎļþÌ«´ó