From b9d9712a32e203560dbe7510857a4cf2e6a0d3b7 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Fri, 20 Dec 2024 17:55:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5=E8=BF=90?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/OpeningOperationPlanRequest.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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<String>  preparationUserIds;
+    private List<String> 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);