diff --git a/src/main/java/com/zsc/edu/dify/modules/system/dto/DeptDto.java b/src/main/java/com/zsc/edu/dify/modules/system/dto/DeptDto.java index 2fa5afa..94575f2 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/dto/DeptDto.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/dto/DeptDto.java @@ -32,6 +32,11 @@ public class DeptDto { @NotBlank(message = "名字不能为空") public String name; + /** + * 启用状态 + */ + public Boolean enabled; + /** * 备注 */ @@ -47,6 +52,7 @@ public class DeptDto { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); return updateWrapper.eq(Dept::getId, id) .set(Dept::getName, name) + .set(Dept::getEnabled, enabled) .set(StringUtils.hasText(remark), Dept::getRemark, remark); } diff --git a/src/main/java/com/zsc/edu/dify/modules/system/dto/RoleDto.java b/src/main/java/com/zsc/edu/dify/modules/system/dto/RoleDto.java index b3f3965..f4a3b5e 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/dto/RoleDto.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/dto/RoleDto.java @@ -23,6 +23,11 @@ public class RoleDto { @NotBlank(message = "名称不能为空") public String name; + /** + * 启用状态 + */ + public Boolean enabled; + /** * 备注 */ diff --git a/src/main/java/com/zsc/edu/dify/modules/system/dto/UserCreateDto.java b/src/main/java/com/zsc/edu/dify/modules/system/dto/UserCreateDto.java index 04e72a0..9ced7a8 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/dto/UserCreateDto.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/dto/UserCreateDto.java @@ -61,7 +61,7 @@ public class UserCreateDto { /** * 昵称 * */ - public String nickName; + public String name; /** * 头像 * */ diff --git a/src/main/java/com/zsc/edu/dify/modules/system/dto/UserSelfUpdateDto.java b/src/main/java/com/zsc/edu/dify/modules/system/dto/UserSelfUpdateDto.java index 3d78a46..319cdcc 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/dto/UserSelfUpdateDto.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/dto/UserSelfUpdateDto.java @@ -31,7 +31,7 @@ public class UserSelfUpdateDto { /** * 昵称 * */ - public String nickName; + public String name; /** * 头像 * */ diff --git a/src/main/java/com/zsc/edu/dify/modules/system/dto/UserUpdateDto.java b/src/main/java/com/zsc/edu/dify/modules/system/dto/UserUpdateDto.java index e16d1ec..54228d5 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/dto/UserUpdateDto.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/dto/UserUpdateDto.java @@ -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; /** * 头像 * */ diff --git a/src/main/java/com/zsc/edu/dify/modules/system/service/impl/RoleServiceImpl.java b/src/main/java/com/zsc/edu/dify/modules/system/service/impl/RoleServiceImpl.java index e425f6c..2dacda8 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/service/impl/RoleServiceImpl.java @@ -83,6 +83,7 @@ public class RoleServiceImpl extends ServiceImpl 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()) { diff --git a/src/main/java/com/zsc/edu/dify/modules/system/service/impl/UserServiceImpl.java b/src/main/java/com/zsc/edu/dify/modules/system/service/impl/UserServiceImpl.java index 55e3c4e..70c5a5e 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/service/impl/UserServiceImpl.java @@ -52,6 +52,7 @@ public class UserServiceImpl extends ServiceImpl implement User user = new User(); dto.setRoleId(dto.getRoleIds().get(0)); userMapper.convert(dto, user); + user.setName(dto.getName()); boolean existsByPhone = count(new LambdaQueryWrapper().eq(User::getPhone, dto.getPhone())) > 0; boolean existsByEmail = count(new LambdaQueryWrapper().eq(User::getEmail, dto.getEmail())) > 0; if (user.getPhone().equals(dto.getPhone()) && existsByPhone) {