diff --git a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java index 885c764..8a423bb 100644 --- a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java +++ b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java @@ -119,7 +119,12 @@ public class MetadataSearchService { if (field != null) { TableField tableField = field.getAnnotation(TableField.class); if (tableField != null && StringUtils.hasText(tableField.value())) { - queryWrapper.orderBy(true, sort.getSort().equalsIgnoreCase("asc"), tableField.value()); + //没有过滤条件时,order by前面会拼接and,导致查询报错 + if(condition.getConditions().size()<=0){ + queryWrapper.last("1=1 ORDER BY "+ tableField.value() + (sort.getSort().equalsIgnoreCase("asc") ? " ASC " :" DESC ")); + }else { + queryWrapper.orderBy(true, sort.getSort().equalsIgnoreCase("asc"), tableField.value()); + } } } }