diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index 41ff0763f..f9fa7d11f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -196,14 +196,21 @@ public class BaseController { if (StringUtils.isBlank(user.getPhone())) { return; } - SysConfig config = sysConfigService.getByKey(SysConfigConstant.merchant_Login_CheckPhone, orgUser); + checkLoginUserPhone(orgUser,user.getPhone(),orgUser.getPhone()); + } + + public void checkLoginUserPhone(TenantEntity tenantEntity,String cuserPhone,String merchantBUserPhone) { + if (StringUtils.isBlank(cuserPhone)) { + return; + } + SysConfig config = sysConfigService.getByKey(SysConfigConstant.merchant_Login_CheckPhone, tenantEntity); if (null != config ) { String v = config.getConfigItemValue(); if (!StringUtils.isBlank(v)) { Integer iv = Integer.parseInt(v); if (iv.intValue() == EnumYesOrNo.YES.getCode().intValue()) { //校验当前登陆人的授权手机号和账号手机号是否一致 - if (!user.getPhone().equals(orgUser.getPhone())) { + if (!cuserPhone.equals(merchantBUserPhone)) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"当前用户授权手机号非登录账号,不允许登录"); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 72288635f..5ed47ea2f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -162,11 +162,6 @@ public class WxInfoController extends BaseController { // if (StringUtils.isNotBlank(buUser.getParentTenantId())) { // request.setAttribute(Constant.PARENT_TENANT_ID, buUser.getParentTenantId()); // } - try { - checkLoginUserPhone(buUser, buUser.getId(),appPlat); - }catch(Exception e) { - return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); - } return new ResultData(resultMap); } @@ -286,7 +281,6 @@ public class WxInfoController extends BaseController { user.setBopenId(buser.getOpenId()); mallUserInfoService.saveOrUpdate(user); - return new ResultData(resultMap); } else { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),user.getName()+"不是超管或者没有数据塔台的权限", resultMap); @@ -343,6 +337,13 @@ public class WxInfoController extends BaseController { String phone = cuserFactory.getBUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, buser, wxAppinfo, isFmOpen); resultMap.put("msg", "授权手机成功!"); resultMap.put("phone", phone); + + try { + checkLoginUserPhone(buser, phone,this.getLoginBUser().getPhone()); + }catch(Exception e) { + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); + } + return new ResultData(resultMap); } catch (Exception e) { this.logger.error(e.getMessage(), e);