From fabfc348ba2e156ea8bf33a2d1df3cd840faff2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com>
Date: Mon, 24 Aug 2020 12:18:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2in=E4=BA=A7=E5=93=81id=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99id=E4=B8=BA=E7=A9=BA=E9=9B=86=E5=90=88=E7=9A=84bug=202?=
 =?UTF-8?q?=E3=80=81=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E4=BA=BA=E4=B8=BAnull=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/impl/StoreProductReplyServiceImpl.java      | 4 +++-
 .../com/zbkj/crmeb/user/service/impl/UserServiceImpl.java     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImpl.java
index e1df5e81..bb15f6cb 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImpl.java
@@ -103,7 +103,9 @@ public class StoreProductReplyServiceImpl extends ServiceImpl<StoreProductReplyD
             storeProductPram.setKeywords(request.getProductSearch());
             List<StoreProduct> storeProducts = storeProductService.getList(storeProductPram, new PageParamRequest());
             List<Integer> productIds = storeProducts.stream().map(StoreProduct::getId).collect(Collectors.toList());
-            lambdaQueryWrapper.in(StoreProductReply::getProductId, productIds);
+            if(productIds.size() > 0){
+                lambdaQueryWrapper.in(StoreProductReply::getProductId, productIds);
+            }
         }
         if(!StringUtils.isBlank(request.getUid())){
             lambdaQueryWrapper.in(StoreProductReply::getUid, CrmebUtil.stringToArray(request.getUid()));
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserServiceImpl.java
index f2eda2ed..85018116 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserServiceImpl.java
@@ -1537,7 +1537,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     @Override
     public void bindSpread(User user, Integer spreadUid) {
         //新用户会在注册的时候单独绑定，此处只处理登录用户
-        if(spreadUid == 0){
+        if(null == spreadUid || spreadUid == 0){
             return;
         }
         //如果当前用户没有绑定，并且后台配置人人分销，那么需要邦迪