菜品

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java

@@ -189,7 +189,12 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
                         return vo;
                     })
                     .collect(Collectors.toList());
-            dailyMenuVOList.sort(Comparator.comparing(DailyMenuAppVO::getSort));
+//            dailyMenuVOList.sort(Comparator.comparing(DailyMenuAppVO::getSort));
+            // 修改排序逻辑，处理null值情况
+            dailyMenuVOList.sort(Comparator.comparing(
+                    DailyMenuAppVO::getSort,
+                    Comparator.nullsFirst(Comparator.naturalOrder())
+            ));
             pageData.setRecords(dailyMenuVOList);
             return pageData;
         }