From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' 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