1

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<>();
+        if(activityPromotion != null) {
-        List<PmnActivityPromotionParam> activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, activityPromotion.getId()));
+            List<PmnActivityPromotionParam> activityPromotionParams = new ArrayList<>();
-        for (PmnActivityPromotionParam activityPromotionParam : activityPromotionParamsAll) {
+            List<PmnActivityPromotionParam> activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, activityPromotion.getId()));
-            if(activityPromotionParam.getName().equals("appId")) {
+            for (PmnActivityPromotionParam activityPromotionParam : activityPromotionParamsAll) {
-                activityScheduleVO.setAppId(activityPromotionParam.getKey());
+                if (activityPromotionParam.getName().equals("appId")) {
-            }else if(activityPromotionParam.getName().equals("uri")) {
+                    activityScheduleVO.setAppId(activityPromotionParam.getKey());
-                activityScheduleVO.setUri(activityPromotionParam.getKey());
+                } else if (activityPromotionParam.getName().equals("uri")) {
-            }else {
+                    activityScheduleVO.setUri(activityPromotionParam.getKey());
-                activityPromotionParams.add(activityPromotionParam);
+                } else {
+                    activityPromotionParams.add(activityPromotionParam);
+                }
             }
+            activityScheduleVO.setParams(activityPromotionParams);
         }
-        activityScheduleVO.setParams(activityPromotionParams);
         return activityScheduleVO;
     }
 }