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 fe5deac..9e8a636 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 @@ -680,13 +680,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse couponInfo(Map param) { + Integer currentPage = (Integer) param.get("currentPage"); PageUtil.setPageInfo(param); if(param.get("hospitalId") == null) { param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 根据登陆人id 查询出来的医院 */ } doHospitalFilter(param); if(param.get("hospitalId") == null) { - return RespBuilder.buildSuccess(new PageResult(0, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>()))); + return RespBuilder.buildSuccess(new PageResult(0, currentPage ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>()))); } Integer type = (Integer) param.get("type"); @@ -738,7 +739,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } int count = couponMapper.findCouponInfoCount(param); - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); return RespBuilder.buildSuccess(pageResult); } if(type == 1) { /** 发放人数统计 */ List> userSendInfo = couponMapper.findUserSendInfo(param); @@ -757,7 +758,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo)); + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo)); return RespBuilder.buildSuccess(pageResult); } else if(type == 999) { /** 先占位置 */