From c695174c78110051581b4af902e80ad87d5324b4 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 12 Aug 2018 15:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=9F=A5=E8=AF=A2=E5=85=A8?= =?UTF-8?q?=E9=83=A8,=E6=8E=A8=E5=B9=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 3e22ec2b9..4929ad0bb 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -44,11 +44,13 @@ public class WxCouponController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { - if (null == wxCoupon) wxCoupon = new WxCoupon(); - if(wxCoupon.getType()!=null&&wxCoupon.getType()==-1){ - wxCoupon.setType(null); + if (null == wxCoupon) wxCoupon = new WxCoupon(); + PageInfo page = null; + if (wxCoupon.getType() != null && wxCoupon.getType() == -1) { + page = wxCouponService.findEnableList(wxCoupon, pageNum, pageSize); + }else { + page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); } - final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); return new ResultData(page); }