From eb89a0cbaedeb2efb60b13316fab76f5240f299f Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 1 Sep 2023 10:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BE=E5=8C=BA=E9=A3=9F?=
 =?UTF-8?q?=E5=A0=82=E5=B1=85=E6=B0=91=E7=AB=AF=E6=9F=A5=E8=AF=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=97=A9=E4=B8=AD=E6=99=9A=E4=B8=89=E9=A4=90=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CanteenMenusServiceImpl.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java
index 8e3825c81e..c4e0085305 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java
@@ -21,6 +21,7 @@ import com.epmet.dto.CanteenMenusDTO;
 import com.epmet.dto.CanteenMenusListDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.entity.CanteenMenusEntity;
+import com.epmet.entity.CommunityCanteenEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.remote.EpmetUserRemoteService;
 import com.epmet.service.CanteenDishesService;
@@ -316,6 +317,12 @@ public class CanteenMenusServiceImpl extends BaseServiceImpl<CanteenMenusDao, Ca
         if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
             wrapper.between("START_TIME", startTime, endTime);
         }
+        if (StringUtils.isNotEmpty(canteenId)) {
+            CommunityCanteenEntity canteenEntity = communityCanteenService.selectById(canteenId);
+            String threeMeals = canteenEntity.getThreeMeals();
+            wrapper.in("MEALS", threeMeals);
+        }
+
         //获取菜单
         List<CanteenMenusEntity> menusDTOList = baseDao.selectList(wrapper);
         if (!CollectionUtils.isEmpty(menusDTOList)) {