From 625ce49c7e7930995b6abfab9c84f5a1701dce46 Mon Sep 17 00:00:00 2001
From: xzh <42543075@qq.com>
Date: Thu, 24 Jul 2025 21:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xxzhx/giftBook/main/service/impl/TGiftBookServiceImpl.java | 1 +
 .../src/main/resources/mapper/main/TGiftBookDetailsMapper.xml  | 3 +++
 2 files changed, 4 insertions(+)

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<TGiftBook> buildQueryWrapper(TGiftBookBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TGiftBook> 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"
             <if test="null != bo.eventType">
                 and tgbd.event_type = #{bo.eventType}
             </if>
+            <if test="null != bo.isReturn">
+                and tgbd.is_return = #{bo.isReturn}
+            </if>
             <if test="null != bo.address">
                 and tgbd.address like concat('%', #{bo.address}, '%')
             </if>