From 82f70d41585fc88893ce673a339d8ed55cf4135d Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 26 Aug 2018 23:07:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA?= =?UTF-8?q?channels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCouponController.java | 17 +++++++++++++---- 1 file changed, 13 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 600940dc6..d760e923d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -73,16 +73,24 @@ public class WxCouponController extends BaseController if(!list.isEmpty()){ Map> groupBy = list.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId)); for (WxCoupon temp:wxCouponList) { - List channels=new ArrayList<>(); + if(groupBy.get(temp.getId())!=null){ + List channels=new ArrayList<>(); for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) { channels.add(tempchannel.getTargetAd()); } - + String sss = JSON.toJSONString(channels); + temp.setChannels(sss); + }else{ + temp.setChannels(""); } - String sss = JSON.toJSONString(channels); - temp.setChannels(sss); + } + }else{ + for (WxCoupon temp:wxCouponList) { + temp.setChannels(""); + } + } return new ResultData(page); @@ -107,6 +115,7 @@ public class WxCouponController extends BaseController wxCoupon.setBusiness(JSON.toJSONString(arys)); } wxCoupon.setTenantId(getUser().getTenantId()); + wxCoupon.setChannels(""); Long id = wxCouponService.saveOrUpdate(wxCoupon); return new ResultData(id); }