| @@ -104,7 +104,7 @@ public class MallUserInfoController extends BaseController { | |||||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户"); | return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户"); | ||||
| } | } | ||||
| if(checkUniqueName(userInfo.getUsername(), currentUser.getTenantId()) > 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(), currentUser.getTenantId()) > 0){ | ||||
| @@ -138,7 +138,7 @@ public class MallUserInfoController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); | MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); | ||||
| if (!oldUser.getUsername().equals(userInfo.getUsername())) { | if (!oldUser.getUsername().equals(userInfo.getUsername())) { | ||||
| if(checkUniqueName(userInfo.getUsername(), currentUser.getTenantId()) > 0){ | |||||
| if(checkUniqueName(userInfo.getUsername()) > 0){ | |||||
| return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); | return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -231,10 +231,9 @@ public class MallUserInfoController extends BaseController { | |||||
| return new ResultData(userInfo); | return new ResultData(userInfo); | ||||
| } | } | ||||
| private int checkUniqueName(String userName, String tenantId) { | |||||
| private int checkUniqueName(String userName) { | |||||
| MallUserInfo userQ = new MallUserInfo(); | MallUserInfo userQ = new MallUserInfo(); | ||||
| userQ.setUsername(userName); | userQ.setUsername(userName); | ||||
| userQ.setTenantId(tenantId); | |||||
| return userInfoService.cntUserList(userQ); | return userInfoService.cntUserList(userQ); | ||||
| } | } | ||||