bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MidPayItemController.java

@@ -124,7 +124,19 @@ public class MidPayItemController extends BladeController {
                     }
                     return vo;
                 })
-                .sorted(Comparator.comparing(MeterMidPayItemSystemVO::getCreateTime))
+                .sorted(
+                        Comparator.nullsLast(
+                                Comparator.<MeterMidPayItemSystemVO, Integer>comparing(
+                                        systemVO -> {
+                                            Integer sortValue = systemVO.getSort();
+                                            return sortValue != null ? sortValue : Integer.MAX_VALUE;
+                                        }
+                                )
+                        )
+                                .thenComparing(
+                                        Comparator.nullsLast(Comparator.comparing(MeterMidPayItemSystemVO::getCreateTime))
+                                )
+                )
                 .collect(Collectors.toList());
 
         IPage<MeterMidPayItemSystemVO> resultPage = new Page<>();
@@ -265,7 +277,19 @@ public class MidPayItemController extends BladeController {
                     }
                     return vo;
                 })
-                .sorted(Comparator.comparing(MeterMidPayItemProjectVO::getCreateTime))
+                .sorted(
+                        Comparator.nullsLast(
+                                Comparator.<MeterMidPayItemProjectVO, Integer>comparing(
+                                        projectVO -> {
+                                            Integer sortValue = projectVO.getSort();
+                                            return sortValue != null ? sortValue : Integer.MAX_VALUE;
+                                        }
+                                )
+                        )
+                                .thenComparing(
+                                        Comparator.nullsLast(Comparator.comparing(MeterMidPayItemProjectVO::getCreateTime))
+                                )
+                )
                 .collect(Collectors.toList());
 
         IPage<MeterMidPayItemProjectVO> resultPage = new Page<>();
@@ -424,7 +448,19 @@ public class MidPayItemController extends BladeController {
                     }
                     return vo;
                 })
-                .sorted(Comparator.comparing(MeterMidPayItemContractVO::getCreateTime))
+                .sorted(
+                        Comparator.nullsLast(
+                                Comparator.<MeterMidPayItemContractVO, Integer>comparing(
+                                        contractVO -> {
+                                            Integer sortValue = contractVO.getSort();
+                                            return sortValue != null ? sortValue : Integer.MAX_VALUE;
+                                        }
+                                )
+                        )
+                                .thenComparing(
+                                        Comparator.nullsLast(Comparator.comparing(MeterMidPayItemContractVO::getCreateTime))
+                                )
+                )
                 .collect(Collectors.toList());
 
         IPage<MeterMidPayItemContractVO> resultPage = new Page<>();