From eaae492de8807438e64b18b60600a52df21d668f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 02 Nov 2021 11:23:09 +0800
Subject: [PATCH] 20211102

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
index 389abfb..0b0eaac 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
@@ -227,7 +227,7 @@
         if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2)
                 && StringUtils.isNotBlank(sysVipInfo.getNickName())) {//目前还不是分销员
             BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId());
-            if (fxSwith.getParamValue().equals("1")) {//开启分销
+            if (fxSwith!=null && fxSwith.getParamValue().equals("1")) {//开启分销
                 BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, loginUser.getCompanyId());
                 if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {//自动成为分销员
                     QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();

--
Gitblit v1.9.1