From 4e93084b3466fa7fcb8431a67e6552f9bbed831f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Mar 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index 74cf382..ed74a5d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -102,7 +102,7 @@
String invitationId = param.get("invitationId");
if(StringUtils.isNotBlank(invitationId)){
BizUser invitationUser = bizUserDao.findByOpenId(invitationId);
- if(invitationUser.getOpenId().equals(loginUser.getOpenId())) {
+ if(invitationUser!=null && invitationUser.getOpenId().equals(loginUser.getOpenId())) {
return AjaxResult.buildFailInstance("不能邀请自己成为推广员");
}
}
--
Gitblit v1.9.1