From 146df2db28ebad655ce0e368c6bac5ab9ff6b0f5 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 26 Aug 2018 17:33:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=88=B8=E7=8A=B6=E6=80=81]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=88=B8=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCampaignController.java | 2 +- .../java/com/simple/controller/WxCampaignController.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) 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);