|
@@ -138,18 +138,18 @@ public class SysUserController extends BaseController
|
|
@ApiOperation("新增用户")
|
|
@ApiOperation("新增用户")
|
|
public Response<Integer> add(@Validated @RequestBody SysUser user)
|
|
public Response<Integer> add(@Validated @RequestBody SysUser user)
|
|
{
|
|
{
|
|
- if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
|
|
|
|
- {
|
|
|
|
- return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
|
|
|
|
- }
|
|
|
|
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
|
|
- {
|
|
|
|
- return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
|
|
|
|
- }
|
|
|
|
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
|
|
- {
|
|
|
|
- return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
|
|
|
|
- }
|
|
|
|
|
|
+// if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
|
|
|
|
+// {
|
|
|
|
+// return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
|
|
|
|
+// }
|
|
|
|
+// else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
|
|
+// {
|
|
|
|
+// return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
|
|
|
|
+// }
|
|
|
|
+// else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
|
|
+// {
|
|
|
|
+// return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
|
|
|
|
+// }
|
|
user.setCreateBy(SecurityUtils.getUsername());
|
|
user.setCreateBy(SecurityUtils.getUsername());
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
return toResponse(userService.insertUser(user));
|
|
return toResponse(userService.insertUser(user));
|
|
@@ -165,14 +165,14 @@ public class SysUserController extends BaseController
|
|
public Response<Integer> edit(@Validated @RequestBody SysUser user)
|
|
public Response<Integer> edit(@Validated @RequestBody SysUser user)
|
|
{
|
|
{
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserAllowed(user);
|
|
- if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
|
|
- {
|
|
|
|
- return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
|
|
|
|
- }
|
|
|
|
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
|
|
- {
|
|
|
|
- return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
|
|
|
|
- }
|
|
|
|
|
|
+// if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
|
|
+// {
|
|
|
|
+// return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
|
|
|
|
+// }
|
|
|
|
+// else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
|
|
+// {
|
|
|
|
+// return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
|
|
|
|
+// }
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
return toResponse(userService.updateUser(user));
|
|
return toResponse(userService.updateUser(user));
|
|
}
|
|
}
|