| @@ -107,7 +107,7 @@ public class MallUserInfoController extends BaseController { | |||||
| if(checkUniqueName(userInfo.getUsername()) > 0){ | if(checkUniqueName(userInfo.getUsername()) > 0){ | ||||
| return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); | return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); | ||||
| } | } | ||||
| if(checkUniquePhone(userInfo.getPhone(), currentUser.getTenantId()) > 0){ | |||||
| if(checkUniquePhone(userInfo.getPhone()) > 0){ | |||||
| return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); | return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); | ||||
| } | } | ||||
| Assert.notNull(userInfo.getPassword(), "密码不能为空"); | Assert.notNull(userInfo.getPassword(), "密码不能为空"); | ||||
| @@ -143,7 +143,7 @@ public class MallUserInfoController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| if (!oldUser.getPhone().equals(userInfo.getPhone())) { | if (!oldUser.getPhone().equals(userInfo.getPhone())) { | ||||
| if(checkUniquePhone(userInfo.getPhone(), currentUser.getTenantId()) > 0){ | |||||
| if(checkUniquePhone(userInfo.getPhone()) > 0){ | |||||
| return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); | return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -237,10 +237,9 @@ public class MallUserInfoController extends BaseController { | |||||
| return userInfoService.cntUserList(userQ); | return userInfoService.cntUserList(userQ); | ||||
| } | } | ||||
| private int checkUniquePhone(String phone, String tenantId) { | |||||
| private int checkUniquePhone(String phone) { | |||||
| MallUserInfo userQ = new MallUserInfo(); | MallUserInfo userQ = new MallUserInfo(); | ||||
| userQ.setPhone(phone); | userQ.setPhone(phone); | ||||
| userQ.setTenantId(tenantId); | |||||
| return userInfoService.cntUserList(userQ); | return userInfoService.cntUserList(userQ); | ||||
| } | } | ||||