sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/wallet/KwpBizWalletService.java

@@ -417,7 +417,9 @@ public class KwpBizWalletService {
                 .ge(request.getMinAmount() != null, KwpBizWalletPrepay::getChangeAmount, request.getMinAmount())
                 .le(request.getMaxAmount() != null, KwpBizWalletPrepay::getChangeAmount, request.getMaxAmount())
                 .ge(request.getStartTime() != null, KwpBizWalletPrepay::getCreateTime, request.getStartTime())
-                .le(request.getEndTime() != null, KwpBizWalletPrepay::getCreateTime, request.getEndTime());
+                .le(request.getEndTime() != null, KwpBizWalletPrepay::getCreateTime, request.getEndTime())
+                .orderByDesc(KwpBizWalletPrepay::getCreateTime)
+                .orderByDesc(KwpBizWalletPrepay::getId);
         Page<KwpBizWalletPrepay> walletPrepayPage = kwpBizWalletPrepayRepository.page(page, queryWrapper);
         //若为null,返回空分页结果
         if (walletPrepayPage == null || CollectionUtils.isEmpty(walletPrepayPage.getRecords())) {
@@ -440,10 +442,7 @@ public class KwpBizWalletService {
                     pageResp.setSupEntName(entName);
                     return pageResp;
                 }).collect(Collectors.toList());
-        walletPrepayPageList.sort(
-                Comparator.comparing(KwpBizWalletPrepayPageResponse::getCreateTime)
-                        .thenComparing(KwpBizWalletPrepayPageResponse::getId).reversed());
-        PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayPageResponse = PageDataResult
+          PageDataResult<KwpBizWalletPrepayPageResponse> walletPrepayPageResponse = PageDataResult
                 .success(request.getPage(), request.getPageSize(), walletPrepayPage.getTotal(), walletPrepayPageList);
         log.info("分页查询钱包冻账明细成功，结果：{}", JSONObject.toJSONString(walletPrepayPageResponse));
         return walletPrepayPageResponse;