xx

孔祥富

2021-03-12 fab1d50fca1bcc38dd37fd7159d5235ddf9593fe

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java

@@ -26,10 +26,10 @@
        page.setCurrent(request.getPageNum());
        page.setSize(request.getPageSize());
        String sortField = request.getField();
        if (camelToUnderscore) {
            sortField = FebsUtil.camelToUnderscore(sortField);
            defaultSort = FebsUtil.camelToUnderscore(defaultSort);
        }
        // if (camelToUnderscore) {
        //     sortField = FebsUtil.camelToUnderscore(sortField);
        //     defaultSort = FebsUtil.camelToUnderscore(defaultSort);
        // }
        if (StringUtils.isNotBlank(request.getField())
                && StringUtils.isNotBlank(request.getOrder())
                && !StringUtils.equalsIgnoreCase(request.getField(), "null")