diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 1b00587..8b5c0e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -3137,8 +3137,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService //秦皇岛年龄筛选 <35 岁(大于等于35需要移除,这里需要重新组装数据) List> couponInfo2=new ArrayList<>(); if(null!=param.get("age")) { - param.put("needPage", false); - couponInfo2=couponMapper.couponInfo2(param); + Map param2=param; + param2.put("needPage",false); + couponInfo2=couponMapper.couponInfo2(param2); Iterator> iterator = couponInfo2.iterator(); while (iterator .hasNext()) { Map map= iterator.next(); @@ -3149,13 +3150,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if (age >= 35) { iterator.remove(); } - if(age<35){ - System.out.println(personModel.getId()); - } } } } - couponInfos = CollectionUtils.getPageIds(couponInfo2, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize")); + boolean needpage = (Boolean) param.get("needPage"); + if (needpage) { + couponInfos = CollectionUtils.getPageIds(couponInfo2, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize")); + }else {//导出用 + couponInfos=couponInfo2; + } + + } String subTitle = null; Set subTitleTempSet = new HashSet<>();