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 97b2176a5..5dbf632e3 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,23 +34,23 @@ 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); + openingOperationPlanDO.setActivityThemeUrl(this.activityThemeUrl); + openingOperationPlanDO.setPreparationUserIds(""); if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java index 026fbdfee..ebe21c056 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java @@ -35,5 +35,4 @@ public class PlanListRequest { private String curUserId; @ApiModelProperty(value = "管辖区域",hidden = true) private List authRegionIds; - } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index a96e141ba..05c56239f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -133,11 +133,13 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); - List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); - List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); + if (StringUtils.isNotBlank(preparationUserIds)){ + List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); + List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); + openingOperationPlanVO.setPreparationUsers(nameByUserId); + } String userName = enterpriseUserDAO.getUserName(openingOperationPlanDO.getSubmittedUserId()); openingOperationPlanVO.setSubmittedUserName(userName); - openingOperationPlanVO.setPreparationUsers(nameByUserId); openingOperationPlanVO.setShopName(shopInfo.getShopName()); return openingOperationPlanVO; }