|
@@ -231,12 +231,6 @@ public class SysUserController extends BaseController {
|
|
|
public AjaxResult add(@Validated @RequestBody SysUser user) {
|
|
|
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
|
|
|
return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
|
- } else if (StringUtils.isNotEmpty(user.getPhoneNum())
|
|
|
- && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
|
|
|
- return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
|
- }else if (StringUtils.isNotEmpty(user.getEmail())
|
|
|
- && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
|
|
|
- return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
|
}
|
|
|
user.setCreateBy(getUserId());
|
|
|
user.setUpdateBy(getUserId());
|
|
@@ -258,12 +252,6 @@ public class SysUserController extends BaseController {
|
|
|
}
|
|
|
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
|
|
|
return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
|
- } else if (StringUtils.isNotEmpty(user.getPhoneNum())
|
|
|
- && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
|
|
|
- return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
|
- } else if (StringUtils.isNotEmpty(user.getEmail())
|
|
|
- && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
|
|
|
- return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
|
}
|
|
|
user.setUpdateBy(getUserId());
|
|
|
return toAjax(userService.updateUsers(user));
|
|
@@ -286,12 +274,6 @@ public class SysUserController extends BaseController {
|
|
|
// userService.checkUserDataScope(user.getId());
|
|
|
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUniqueUpdate(user))) {
|
|
|
return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
|
- } else if (StringUtils.isNotEmpty(user.getPhoneNum())
|
|
|
- && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUniqueUpdate(user))) {
|
|
|
- return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
|
- } else if (StringUtils.isNotEmpty(user.getEmail())
|
|
|
- && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUniqueUpdate(user))) {
|
|
|
- return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
|
}
|
|
|
user.setUpdateBy(getUsername());
|
|
|
user.setUpdateTime(new Date());
|