From b22b54ccaf585e93fe22b717417b8817d51f8be7 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Thu, 4 Jun 2020 15:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8,=E6=AC=A2=E8=BF=8E?=
 =?UTF-8?q?=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index e604bc7..bf7b546 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -237,7 +237,7 @@ public class CustomerService {
                     content.put("content", welcome.getContent());
                     returnValue.put("text", content);
                     List<PmnActivityInstanceConfig> configs = pmnActivityInstanceConfigService.list(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId()));
-                    if(configs.size() > 0) {
+                    if (configs.size() > 0) {
                         List<PmnActivityPromotionParam> params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet()));
                         for (PmnActivityPromotionParam param : params) {
                             if (param.getType().equals(1)) {
@@ -263,6 +263,8 @@ public class CustomerService {
                             }
                         }
                     }
+                } else {
+                    return null;
                 }
             }
         }