diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 685d8bff..6c99e4ee 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -25,6 +25,7 @@ import cn.ysk.cashier.service.shop.TbShopTableService; import cn.ysk.cashier.dto.shop.TbShopTableDto; import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria; import cn.ysk.cashier.mapper.shop.TbShopTableMapper; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Page; @@ -42,6 +43,7 @@ import javax.servlet.http.HttpServletResponse; * @author lyf * @date 2024-01-18 **/ +@Slf4j @Service @RequiredArgsConstructor public class TbShopTableServiceImpl implements TbShopTableService { @@ -73,7 +75,8 @@ public class TbShopTableServiceImpl implements TbShopTableService { @Override public Map queryAllNoPage(TbShopTableQueryCriteria criteria){ - if (criteria.getAreaId() != null || criteria.getAreaId() == 0) { + log.info("台桌criteria,{}", criteria); + if (criteria != null || criteria.getAreaId() == 0) { criteria.setAreaId(null); } List tbShopTableList = tbShopTableRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder));