From 1cd45f3345ccc18b509b767985c69f60fb3d6a11 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Fri, 29 Nov 2024 10:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/pom.xml                                                           | 2 +-
 .../src/main/java/com/example/recharge/mapper/ActivityMapper.java      | 2 +-
 .../main/java/com/example/recharge/service/RechargeServiceImpl.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/pom.xml b/demo/pom.xml
index 7dddee4..699c8cb 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
index 8fc2294..ea40137 100644
--- a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
+++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
@@ -51,10 +51,10 @@ public interface ActivityMapper {
             "select activity.*,admin.name from activity",
             "inner join admin on activity.admin_id=admin.admin_id ",
             "<where>",
+            "`activity_flag`=1",
             "<if test='startTime!=null'>start_time=#{startTime}</if>",
             "<if test='endTime!=null'>and end_time=#{endTime}</if>",
             "<if test='activityName!=null'>and activity_name like concat('%','#{activityName}','%')</if>",
-            "<if test='flag!=null'>and flag=1)</if>",
             "</where>",
             "</script>"
 
diff --git a/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java b/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java
index 5d5eee0..be01d09 100644
--- a/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java
+++ b/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java
@@ -4,6 +4,7 @@ import com.example.commons.domain.entity.Recharge;
 import com.example.commons.domain.vo.RechargeVo;
 import com.example.commons.sevice.RechargeService;
 import com.example.recharge.mapper.RechargeMapper;
+
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
@@ -38,7 +39,7 @@ public class RechargeServiceImpl implements RechargeService {
 
     @Override
     public PageInfo<RechargeVo> searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) {
-        PageHelper.startPage(pageNum,pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         List<RechargeVo> list= rechargeMapper.select(rechargeVo);
         return new PageInfo<>(list);
     }