From 0838f85fa74b36638adf2621bc2f49a345982dec Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 03 九月 2025 17:21:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java index 520f44e..6aa84bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java @@ -1,10 +1,15 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.mapper.TSysActivityMapper; import com.ruoyi.system.model.TSysActivity; +import com.ruoyi.system.model.TSysEducationalInfo; +import com.ruoyi.system.query.TSysActivityQuery; import com.ruoyi.system.service.TSysActivityService; import org.springframework.stereotype.Service; + +import java.util.List; /** * <p> @@ -17,4 +22,11 @@ @Service public class TSysActivityServiceImpl extends ServiceImpl<TSysActivityMapper, TSysActivity> implements TSysActivityService { + @Override + public PageInfo<TSysActivity> pageList(TSysActivityQuery query) { + PageInfo<TSysActivity> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TSysActivity> list = this.baseMapper.pageList(query,pageInfo); + pageInfo.setRecords(list); + return pageInfo; + } } -- Gitblit v1.7.1