单位主体分页排序、示范项目分页排序修复

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;
     }
+
 }