Browse Source

code style

miemie 4 years ago
parent
commit
2732065c5b

+ 5 - 3
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java

@@ -394,8 +394,7 @@ public class PaginationInnerInterceptor implements InnerInterceptor {
     }
     }
 
 
     protected List<OrderByElement> addOrderByElements(List<OrderItem> orderList, List<OrderByElement> orderByElements) {
     protected List<OrderByElement> addOrderByElements(List<OrderItem> orderList, List<OrderByElement> orderByElements) {
-        orderByElements = CollectionUtils.isEmpty(orderByElements) ? new ArrayList<>(orderList.size()) : orderByElements;
-        List<OrderByElement> orderByElementList = orderList.stream()
+        List<OrderByElement> additionalOrderBy = orderList.stream()
             .filter(item -> StringUtils.isNotBlank(item.getColumn()))
             .filter(item -> StringUtils.isNotBlank(item.getColumn()))
             .map(item -> {
             .map(item -> {
                 OrderByElement element = new OrderByElement();
                 OrderByElement element = new OrderByElement();
@@ -404,7 +403,10 @@ public class PaginationInnerInterceptor implements InnerInterceptor {
                 element.setAscDescPresent(true);
                 element.setAscDescPresent(true);
                 return element;
                 return element;
             }).collect(Collectors.toList());
             }).collect(Collectors.toList());
-        orderByElements.addAll(orderByElementList);
+        if (CollectionUtils.isEmpty(orderByElements)) {
+            return additionalOrderBy;
+        }
+        orderByElements.addAll(additionalOrderBy);
         return orderByElements;
         return orderByElements;
     }
     }