소스 검색

临时兼容一下 page 最终还是取pageNum

xgb 6 일 전
부모
커밋
a94cdf3dfc

+ 2 - 0
fs-service/src/main/java/com/fs/his/param/FsIntegralGoodsListUParam.java

@@ -10,6 +10,8 @@ public class FsIntegralGoodsListUParam  implements Serializable {
     Integer goodsType;
     @ApiModelProperty(value = "页码,默认为1")
     private Integer pageNum =1;
+
+    private Integer page =1;
     @ApiModelProperty(value = "页大小,默认为10")
     private Integer pageSize = 10;
     private String keyword;

+ 2 - 1
fs-user-app/src/main/java/com/fs/app/controller/IntegralController.java

@@ -55,7 +55,8 @@ public class IntegralController extends  AppBaseController {
     @Cacheable(value = "getIntegralGoodsList", key = "#param")
     public R getIntegralGoodsList(FsIntegralGoodsListUParam param)
     {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        Integer pageNum = param.getPageNum()!=null?param.getPageNum():param.getPage();
+        PageHelper.startPage(pageNum, param.getPageSize());
         List<FsIntegralGoodsListUVO> list=goodsService.selectFsIntegralGoodsListUVO(param);
         PageInfo<FsIntegralGoodsListUVO> listPageInfo=new PageInfo<>(list);
         return R.ok().put("data",listPageInfo);