diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java index 593968d..874f6d4 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java @@ -118,18 +118,20 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityPromotion::getScheduleId, activitySchedule.getId())); - List activityPromotionParams = new ArrayList<>(); - List activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, activityPromotion.getId())); - for (PmnActivityPromotionParam activityPromotionParam : activityPromotionParamsAll) { - if(activityPromotionParam.getName().equals("appId")) { - activityScheduleVO.setAppId(activityPromotionParam.getKey()); - }else if(activityPromotionParam.getName().equals("uri")) { - activityScheduleVO.setUri(activityPromotionParam.getKey()); - }else { - activityPromotionParams.add(activityPromotionParam); + if(activityPromotion != null) { + List activityPromotionParams = new ArrayList<>(); + List activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, activityPromotion.getId())); + for (PmnActivityPromotionParam activityPromotionParam : activityPromotionParamsAll) { + if (activityPromotionParam.getName().equals("appId")) { + activityScheduleVO.setAppId(activityPromotionParam.getKey()); + } else if (activityPromotionParam.getName().equals("uri")) { + activityScheduleVO.setUri(activityPromotionParam.getKey()); + } else { + activityPromotionParams.add(activityPromotionParam); + } } + activityScheduleVO.setParams(activityPromotionParams); } - activityScheduleVO.setParams(activityPromotionParams); return activityScheduleVO; } }