From 1e40e3fbcaf45f454fc363bbaabf3794a924cc91 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Sat, 10 May 2025 23:22:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=92=8C=E8=A7=92=E8=89=B2=E7=9A=84=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E7=9B=B8=E5=85=B3=20DTO=20=E5=92=8C?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DeptDto 和 RoleDto 中添加 enabled 字段，表示启用状态 - 更新 UserCreateDto 和 UserSelfUpdateDto，将 nickName 改为 name - 在 UserServiceImpl 中为用户设置 name 字段 - 更新 UserUpdateDto，将 enable 改为 enableState --- .../java/com/zsc/edu/dify/modules/system/dto/DeptDto.java | 6 ++++++ .../java/com/zsc/edu/dify/modules/system/dto/RoleDto.java | 5 +++++ .../com/zsc/edu/dify/modules/system/dto/UserCreateDto.java | 2 +- .../zsc/edu/dify/modules/system/dto/UserSelfUpdateDto.java | 2 +- .../com/zsc/edu/dify/modules/system/dto/UserUpdateDto.java | 4 ++-- .../dify/modules/system/service/impl/RoleServiceImpl.java | 1 + .../dify/modules/system/service/impl/UserServiceImpl.java | 1 + 7 files changed, 17 insertions(+), 4 deletions(-) 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) {