|
|
|
@@ -330,11 +330,11 @@ public class WxMallServiceImpl implements WxMallService { |
|
|
|
if(!oldUser.getTenantId().equals(userInfo.getTenantId())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配"); |
|
|
|
} |
|
|
|
if (!oldUser.getUsername().equals(userInfo.getUsername())) { |
|
|
|
if(userInfoService.cntByUserName(userInfo.getUsername()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
// if (!oldUser.getUsername().equals(userInfo.getUsername())) { |
|
|
|
// if(userInfoService.cntByUserName(userInfo.getUsername()) > 0){ |
|
|
|
// return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); |
|
|
|
// } |
|
|
|
// } |
|
|
|
if (!oldUser.getPhone().equals(userInfo.getPhone())) { |
|
|
|
if(userInfoService.cntByUserPhone(userInfo.getPhone()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); |
|
|
|
|