From 694465bb74ef41e021131396493e2b7a09db14fa Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Thu, 6 Jun 2024 14:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=BB=E4=BD=93=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=92=E5=BA=8F=E3=80=81=E7=A4=BA=E8=8C=83=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=86=E9=A1=B5=E6=8E=92=E5=BA=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 3f21b57..107838a 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -959,7 +959,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             newRecords.add(newRecord);
         }
         //资金执行率和上级资金执行率排序
-        List<DimensionPageResponse> sortedDimensionPageResponse = newRecords.stream().sorted(Comparator.comparing(DimensionPageResponse::getPaymentExecutionRate).reversed()).collect(Collectors.toList());;
+        List<DimensionPageResponse> sortedDimensionPageResponse = newRecords;;
         if (Objects.equals(orderBy, "paymentExecutionRate")&& Objects.equals(orderDir, "desc")){
             sortedDimensionPageResponse=newRecords.stream().sorted(Comparator.comparing(DimensionPageResponse::getPaymentExecutionRate).reversed()).collect(Collectors.toList());
         } else if (Objects.equals(orderBy, "paymentExecutionRate") && Objects.equals(orderDir, "asc")) {
@@ -1019,7 +1019,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             newRecords.add(newRecord);
         }
         //资金执行率和上级资金执行率排序
-        List<ProjectPageResponse> sortedProjectPageResponse = newRecords.stream().sorted(Comparator.comparing(ProjectPageResponse::getPaymentExecutionRate).reversed()).collect(Collectors.toList());;
+        List<ProjectPageResponse> sortedProjectPageResponse = newRecords;
         if (Objects.equals(orderBy, "paymentExecutionRate")&& Objects.equals(orderDir, "desc")){
             sortedProjectPageResponse=newRecords.stream().sorted(Comparator.comparing(ProjectPageResponse::getPaymentExecutionRate).reversed()).collect(Collectors.toList());
         } else if (Objects.equals(orderBy, "paymentExecutionRate") && Objects.equals(orderDir, "asc")) {
@@ -1183,4 +1183,5 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                 .build();
         return fundByTypeResponse;
     }
+
 }