diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java index 29ccd9fd98..1297ccb96c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java @@ -31,16 +31,4 @@ public class ResiActContentFormDTO implements Serializable { */ @NotBlank(message = "活动Id不能为空", groups = { AddUserInternalGroup.class }) private String actId; - - /** - * 页码,从1开始 - */ - @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class }) - private Integer pageNo; - - /** - * 页容量,默认20页 - */ - @Min(value = 1, message = "每页条数必须大于必须大于0", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class }) - private Integer pageSize; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java index d3f9087afc..e3331cf7a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java @@ -107,8 +107,6 @@ public class ActSummaryServiceImpl extends BaseServiceImpl summaryList(ResiActContentFormDTO formDto) { - int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageNo(pageIndex); return new Result().ok(baseDao.selectListSummary(formDto)); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml index 6ff1b956d0..ff8b70f796 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml @@ -29,6 +29,5 @@ WHERE s.DEL_FLAG = '0' AND s.ACT_ID = #{actId} ORDER BY s.ORDER_NUM ASC - LIMIT #{pageNo}, #{pageSize}