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 @@ com.github.pagehelper pagehelper-spring-boot-starter - 1.4.7 + 1.4.6 org.slf4j 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 ", "", + "`activity_flag`=1", "start_time=#{startTime}", "and end_time=#{endTime}", "and activity_name like concat('%','#{activityName}','%')", - "and flag=1)", "", "" 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 searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) { - PageHelper.startPage(pageNum,pageSize); + PageHelper.startPage(pageNum, pageSize); List list= rechargeMapper.select(rechargeVo); return new PageInfo<>(list); }