From a53921de80469ca728349e769b9d7036ddf483da Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 27 Feb 2025 14:52:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=AE=89=E6=8E=92=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/holiday/service/WorkReportServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/WorkReportServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/WorkReportServiceImpl.java index 5c35bbc..d72314a 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/WorkReportServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/WorkReportServiceImpl.java @@ -23,6 +23,8 @@ import com.bonus.system.holiday.entity.HolidayBean; import com.bonus.system.holiday.entity.HolidayImportBean; import com.bonus.system.holiday.entity.HolidayKeyBean; import com.bonus.system.holiday.entity.WorkReportBean; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -37,6 +39,8 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; +import static com.bonus.common.core.utils.PageUtils.startPage; + /** * 项目部角色-业务层 * @@ -78,6 +82,7 @@ public class WorkReportServiceImpl implements WorkReportService { @Override public List getWorkReportList(WorkReportBean bean) { + PageHelper.clearPage(); List workReportList = new ArrayList<>(); Long userId = SecurityUtils.getUserId(); int roleCount = 0; @@ -101,6 +106,7 @@ public class WorkReportServiceImpl implements WorkReportService { return workReportList; } } + startPage(); workReportList = dao.getWorkReportList(bean); for (WorkReportBean workReportBean : workReportList) { if (StringHelper.isNotEmpty(workReportBean.getCheckId())) { @@ -116,6 +122,7 @@ public class WorkReportServiceImpl implements WorkReportService { } } +// PageInfo pageInfo = new PageInfo<>(workReportList); return workReportList; }