From 070bf9c495dbc3b629b3119909ec6f60d010d1d7 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sat, 31 May 2025 10:51:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CookRecipeServiceImpl.java   | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
index f72a843..653fb25 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
@@ -241,11 +241,13 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
         if (!CollectionUtils.isEmpty(cookRecipeDTO.getRecipeDateList())) {
             for (CookRecipeDateDTO recipeDateDTO : cookRecipeDTO.getRecipeDateList()) {
                 List<CookRecipeDetailDTO> detailList = recipeDateDTO.getDetailList();
-                for (CookRecipeDetailDTO detailDTO : detailList) {
-                    if (CollectionUtils.isEmpty(detailDTO.getDishesList())) { //不插入空数据
-                        continue;
+                if (!CollectionUtils.isEmpty(detailList)) {
+                    for (CookRecipeDetailDTO detailDTO : detailList) {
+                        if (CollectionUtils.isEmpty(detailDTO.getDishesList())) { //不插入空数据
+                            continue;
+                        }
+                        insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
                     }
-                    insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
                 }
             }
         }
@@ -254,11 +256,13 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
         if (!CollectionUtils.isEmpty(generatedRecipeDateList)) {
             for (CookRecipeDateDTO recipeDateDTO : generatedRecipeDateList) {
                 List<CookRecipeDetailDTO> detailList = recipeDateDTO.getDetailList();
-                for (CookRecipeDetailDTO detailDTO : detailList) {
-                    if (CollectionUtils.isEmpty(detailDTO.getDishesList())) { //不插入空数据
-                        continue;
+                if (!CollectionUtils.isEmpty(detailList)) {
+                    for (CookRecipeDetailDTO detailDTO : detailList) {
+                        if (CollectionUtils.isEmpty(detailDTO.getDishesList())) { //不插入空数据
+                            continue;
+                        }
+                        insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
                     }
-                    insertDetailAndDishes(cookRecipeDTO, recipeDateDTO, detailDTO);
                 }
             }
         }
@@ -293,15 +297,6 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
                     }
                 }
                 recipeDateListNew.add(cookRecipeDateDTO);
-//                if (!CollectionUtils.isEmpty(cookRecipeDateDTO.getDetailList())) {
-//                    List<CookRecipeDetailDTO> detailList = cookRecipeDateDTO.getDetailList();
-//                    for (CookRecipeDetailDTO detail : detailList) {
-//                        if (!CollectionUtils.isEmpty(detail.getDishesList())) {
-//                            recipeDateListNew.add(cookRecipeDateDTO);
-//                        }
-//                        break;
-//                    }
-//                }
             }
         }
         return recipeDateListNew;