diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java index f8a5dd819..b82468200 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java @@ -34,27 +34,28 @@ public class OpeningOperationPlanRequest { private String activityTheme; @ApiModelProperty("活动主题url") - private String activityThemeUrl; + private String activityThemeUrl; @ApiModelProperty("筹备人员ids") - private List preparationUserIds; + private List preparationUserIds; @ApiModelProperty("是否完成排车路线0未完成,1完成") private Byte routeCompleted; - public OpeningOperationPlanDO toOpeningOperationPlanDO() { OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO(); openingOperationPlanDO.setShopId(this.shopId); openingOperationPlanDO.setPlanSource(this.planSource); openingOperationPlanDO.setSurveyResult(this.surveyResult); openingOperationPlanDO.setSurveyResultUrl(this.surveyResultUrl); - openingOperationPlanDO.setActivityThemeUrl( this.activityThemeUrl); - if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { - openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); - }else if (this.preparationUserIds.isEmpty()){ - openingOperationPlanDO.setPreparationUserIds(""); + openingOperationPlanDO.setActivityThemeUrl(this.activityThemeUrl); + if (this.preparationUserIds != null) { + if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { + openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); + } else if (this.preparationUserIds.isEmpty()) { + openingOperationPlanDO.setPreparationUserIds(""); + } } openingOperationPlanDO.setActivityTheme(this.activityTheme); openingOperationPlanDO.setRouteCompleted(this.routeCompleted);