卡券查询全部,推广查询

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<WxCoupon> page = null;
+        if (wxCoupon.getType() != null && wxCoupon.getType() == -1) {
+            page = wxCouponService.findEnableList(wxCoupon, pageNum, pageSize);
+        }else {
+            page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize);
         }
-        final PageInfo<WxCoupon> page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize);
         return new ResultData(page);
     }