From 0be544627b86d689efd513a2e2eb4934ada2eb64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Wed, 20 May 2020 23:29:31 +0800
Subject: [PATCH] 1

---
 .../impl/PmnActivityScheduleServiceImpl.java  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

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 ServiceImpl<PmnActivitySched
         activityScheduleVO.setName(activitySchedule.getName());
         activityScheduleVO.setDescription(activitySchedule.getDescription());
         PmnActivityPromotion activityPromotion = activityPromotionService.getOne(Wrappers.<PmnActivityPromotion>lambdaQuery().eq(PmnActivityPromotion::getScheduleId, activitySchedule.getId()));
-        List<PmnActivityPromotionParam> activityPromotionParams = new ArrayList<>();
-        List<PmnActivityPromotionParam> activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.<PmnActivityPromotionParam>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<PmnActivityPromotionParam> activityPromotionParams = new ArrayList<>();
+            List<PmnActivityPromotionParam> activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.<PmnActivityPromotionParam>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;
     }
 }