feat(system): 添加部门和角色的启用状态字段,并更新用户相关 DTO 和服务
- 在 DeptDto 和 RoleDto 中添加 enabled 字段,表示启用状态 - 更新 UserCreateDto 和 UserSelfUpdateDto,将 nickName 改为 name - 在 UserServiceImpl 中为用户设置 name 字段 - 更新 UserUpdateDto,将 enable 改为 enableState
This commit is contained in:
parent
36e21c6cfe
commit
1e40e3fbca
@ -32,6 +32,11 @@ public class DeptDto {
|
||||
@NotBlank(message = "名字不能为空")
|
||||
public String name;
|
||||
|
||||
/**
|
||||
* 启用状态
|
||||
*/
|
||||
public Boolean enabled;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ -47,6 +52,7 @@ public class DeptDto {
|
||||
LambdaUpdateWrapper<Dept> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
return updateWrapper.eq(Dept::getId, id)
|
||||
.set(Dept::getName, name)
|
||||
.set(Dept::getEnabled, enabled)
|
||||
.set(StringUtils.hasText(remark), Dept::getRemark, remark);
|
||||
}
|
||||
|
||||
|
@ -23,6 +23,11 @@ public class RoleDto {
|
||||
@NotBlank(message = "名称不能为空")
|
||||
public String name;
|
||||
|
||||
/**
|
||||
* 启用状态
|
||||
*/
|
||||
public Boolean enabled;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
@ -61,7 +61,7 @@ public class UserCreateDto {
|
||||
/**
|
||||
* 昵称
|
||||
* */
|
||||
public String nickName;
|
||||
public String name;
|
||||
/**
|
||||
* 头像
|
||||
* */
|
||||
|
@ -31,7 +31,7 @@ public class UserSelfUpdateDto {
|
||||
/**
|
||||
* 昵称
|
||||
* */
|
||||
public String nickName;
|
||||
public String name;
|
||||
/**
|
||||
* 头像
|
||||
* */
|
||||
|
@ -37,7 +37,7 @@ public class UserUpdateDto {
|
||||
* 启用状态
|
||||
*/
|
||||
@NotNull(message = "启用状态不能为空")
|
||||
public Boolean enable;
|
||||
public Boolean enableState;
|
||||
|
||||
/**
|
||||
* 部门ID
|
||||
@ -47,7 +47,7 @@ public class UserUpdateDto {
|
||||
/**
|
||||
* 昵称
|
||||
* */
|
||||
public String nickName;
|
||||
public String name;
|
||||
/**
|
||||
* 头像
|
||||
* */
|
||||
|
@ -83,6 +83,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleRepository, Role> implement
|
||||
throw new ConstraintException("name", dto.getName(), "同名角色已存在");
|
||||
}
|
||||
selectyRole.setName(dto.getName());
|
||||
selectyRole.setEnabled(dto.getEnabled());
|
||||
selectyRole.setRemark(dto.getRemark());
|
||||
updateById(selectyRole);
|
||||
if (dto.getMenuIds() != null && !dto.getMenuIds().isEmpty()) {
|
||||
|
@ -52,6 +52,7 @@ public class UserServiceImpl extends ServiceImpl<UserRepository, User> implement
|
||||
User user = new User();
|
||||
dto.setRoleId(dto.getRoleIds().get(0));
|
||||
userMapper.convert(dto, user);
|
||||
user.setName(dto.getName());
|
||||
boolean existsByPhone = count(new LambdaQueryWrapper<User>().eq(User::getPhone, dto.getPhone())) > 0;
|
||||
boolean existsByEmail = count(new LambdaQueryWrapper<User>().eq(User::getEmail, dto.getEmail())) > 0;
|
||||
if (user.getPhone().equals(dto.getPhone()) && existsByPhone) {
|
||||
|
Loading…
Reference in New Issue
Block a user