diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java index e3430b4bb..6a2885621 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java @@ -101,7 +101,7 @@ public class WxCampaignController extends BaseController WxCoupon wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); wxCoupon.setIds(list); - wxCoupon.setStatus(1); + wxCoupon.setStatus(0); List couponlist = wxCouponService.findList(wxCoupon); wxCampaign.setCoupons(couponlist); } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java index 856480e09..f60988ad2 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java @@ -40,10 +40,9 @@ public class WxCampaignController 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 WxCampaign wxCampaign, Integer pageNum, Integer pageSize) { - if (null == wxCampaign) wxCampaign = new WxCampaign(); - if(wxCampaign.getStatus()!=null&&wxCampaign.getStatus()==-1){ - wxCampaign.setStatus(null); - } + if (null == wxCampaign) wxCampaign = new WxCampaign(); + + wxCampaign.setStatus(0); wxCampaign.setTenantId(getTenantId()); wxCampaign.setSortColumns(SortNum_ASC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize);