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 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 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 detailList = cookRecipeDateDTO.getDetailList(); -// for (CookRecipeDetailDTO detail : detailList) { -// if (!CollectionUtils.isEmpty(detail.getDishesList())) { -// recipeDateListNew.add(cookRecipeDateDTO); -// } -// break; -// } -// } } } return recipeDateListNew;