Merge branch 'dev'

2 years ago · 0915777c1a
1 changed files with 3 additions and 1 deletions
--- 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
@ -320,7 +320,9 @@ public class CanteenMenusServiceImpl extends BaseServiceImpl<CanteenMenusDao, Ca
        if (StringUtils.isNotEmpty(canteenId)) {
            CommunityCanteenEntity canteenEntity = communityCanteenService.selectById(canteenId);
            String threeMeals = canteenEntity.getThreeMeals();
-            wrapper.in("MEALS", threeMeals);
+            if (StringUtils.isNotEmpty(threeMeals)) {
+                wrapper.in("MEALS", threeMeals.split(","));
+            }
        }

        //获取菜单