Merge branch 'dev/nx-20250526' into 'master'

农信停餐不展示整周停餐学生 See merge request !5

Merge branch 'dev/nx-20250526' into 'master'
农信停餐不展示整周停餐学生 See merge request !5
孟苏慧
Commit 69fd05a23a61aab1c91a8eea31ca1a9e3d1a5661 69fd05a2 2 parents 5413121f efe00eae
Showing 1 changed file with 4 additions and 0 deletions
src/main/java/com/infoloop/tianting/logic/task/AutoCreateMealOrderTask.java
--- a/src/main/java/com/infoloop/tianting/logic/task/AutoCreateMealOrderTask.java
View file @69fd05a
+++ b/src/main/java/com/infoloop/tianting/logic/task/AutoCreateMealOrderTask.java
View file @69fd05a
@@ -241,6 +241,10 @@ public class AutoCreateMealOrderTask {
         // 构建下周的餐食安排
         List<MenuSchedule> meals = buildNextWeekMeals(startOfNextWeek, suspensionRecord, holidayMap);
+        if (meals.isEmpty()) {
+            return null;
+        }
+
         return MealOrderCreation.newBuilder()
                 .setClientId(diner.getClientId())
                 .setMenuId(menu.getId())