diff --git a/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookServiceImpl.java b/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookServiceImpl.java index 799a01a..dd077b9 100644 --- a/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookServiceImpl.java +++ b/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookServiceImpl.java @@ -73,6 +73,7 @@ public class TGiftBookServiceImpl implements ITGiftBookService { private LambdaQueryWrapper buildQueryWrapper(TGiftBookBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(TGiftBook::getDelFlag, 0); lqw.orderByAsc(TGiftBook::getId); lqw.like(StringUtils.isNotBlank(bo.getName()), TGiftBook::getName, bo.getName()); return lqw; diff --git a/giftBook-modules/giftBook-main/src/main/resources/mapper/main/TGiftBookDetailsMapper.xml b/giftBook-modules/giftBook-main/src/main/resources/mapper/main/TGiftBookDetailsMapper.xml index b853129..b72fe11 100644 --- a/giftBook-modules/giftBook-main/src/main/resources/mapper/main/TGiftBookDetailsMapper.xml +++ b/giftBook-modules/giftBook-main/src/main/resources/mapper/main/TGiftBookDetailsMapper.xml @@ -20,6 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tgbd.event_type = #{bo.eventType} + + and tgbd.is_return = #{bo.isReturn} + and tgbd.address like concat('%', #{bo.address}, '%')