From d05eba3937383dfea7359b829677a14eeaad992c Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 18 Apr 2025 10:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/service/impl/CanteenDailyMenuServiceImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
index 4a8a9c4ee..b2eddadd9 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
+++ b/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;
         }