|
|
|
@@ -94,10 +94,10 @@ public class MallUserInfoController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户"); |
|
|
|
} |
|
|
|
|
|
|
|
if(checkUniqueName(userInfo.getUsername(), null)){ |
|
|
|
if(checkUniqueName(userInfo.getUsername(), currentUser.getTenantId()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_NAME_IS_FOUND,"用户名已存在"); |
|
|
|
} |
|
|
|
if(checkUniquePhone(userInfo.getPhone(), null)){ |
|
|
|
if(checkUniquePhone(userInfo.getPhone(), currentUser.getTenantId()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); |
|
|
|
} |
|
|
|
Assert.notNull(userInfo.getPassword(), "密码不能为空"); |
|
|
|
@@ -125,12 +125,16 @@ public class MallUserInfoController extends BaseController { |
|
|
|
currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) { |
|
|
|
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "超级管理员和自己才能修改信息"); |
|
|
|
} |
|
|
|
//Assert.notNull(userInfo.getUsername(), "用户名不能为空"); |
|
|
|
if(checkUniqueName(userInfo.getUsername(), userInfo.getId())){ |
|
|
|
return new ResultData(ErrorCode.USER_NAME_IS_FOUND,"用户名已存在"); |
|
|
|
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); |
|
|
|
if (!oldUser.getUsername().equals(userInfo.getUsername())) { |
|
|
|
if(checkUniqueName(userInfo.getUsername(), currentUser.getTenantId()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_NAME_IS_FOUND,"用户名已存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
if(checkUniquePhone(userInfo.getPhone(), userInfo.getId())){ |
|
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); |
|
|
|
if (!oldUser.getPhone().equals(userInfo.getPhone())) { |
|
|
|
if(checkUniquePhone(userInfo.getPhone(), currentUser.getTenantId()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
userInfo.setTenantId(getTenantId()); |
|
|
|
@@ -150,8 +154,8 @@ public class MallUserInfoController extends BaseController { |
|
|
|
adminUser.setPassword(userInfo.getPassword()); |
|
|
|
bModify = true; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(userInfo.getNickName())) { |
|
|
|
adminUser.setNickName(userInfo.getNickName()); |
|
|
|
if (StringUtils.isNotBlank(userInfo.getUsername())) { |
|
|
|
adminUser.setUsername(userInfo.getUsername()); |
|
|
|
} |
|
|
|
if (bModify) { |
|
|
|
userInfoService.saveOrUpdate(adminUser); |
|
|
|
@@ -206,12 +210,18 @@ public class MallUserInfoController extends BaseController { |
|
|
|
return new ResultData(userInfo); |
|
|
|
} |
|
|
|
|
|
|
|
private boolean checkUniqueName(String username, Long id) { |
|
|
|
return userInfoService.cntByUserName(username,id); |
|
|
|
private int checkUniqueName(String userName, String tenantId) { |
|
|
|
MallUserInfo userQ = new MallUserInfo(); |
|
|
|
userQ.setUsername(userName); |
|
|
|
userQ.setTenantId(tenantId); |
|
|
|
return userInfoService.cntUserList(userQ); |
|
|
|
} |
|
|
|
|
|
|
|
private boolean checkUniquePhone(String phone, Long id) { |
|
|
|
return userInfoService.cntByUserPhone(phone,id); |
|
|
|
private int checkUniquePhone(String phone, String tenantId) { |
|
|
|
MallUserInfo userQ = new MallUserInfo(); |
|
|
|
userQ.setPhone(phone); |
|
|
|
userQ.setTenantId(tenantId); |
|
|
|
return userInfoService.cntUserList(userQ); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|