From 9c5d7547fa9b37c09659c90448ade6df6db4f2de Mon Sep 17 00:00:00 2001 From: JiangYouYao <ak473600000> Date: Tue, 15 Mar 2022 10:46:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop --- 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 8916a52..ee68131 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 @@ -238,7 +238,7 @@ if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2) && StringUtils.isNotBlank(sysVipInfo.getNickName())) {//目前还不是分销员 BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId()); - if (fxSwith!=null && fxSwith.getParamValue().equals("1")) {//开启分销 + if (fxSwith!=null && "1".equals(fxSwith.getParamValue())) {//开启分销 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