From 9df531fa13ddbd765be5a050973cd1df45dad0b9 Mon Sep 17 00:00:00 2001 From: stylefeng Date: Mon, 20 Jan 2025 16:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E7=94=A8=E6=88=B7=E8=A2=AB?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=9A=84=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/modular/user/entity/SysUser.java | 7 +++++++ .../sys/modular/user/service/impl/SysUserServiceImpl.java | 6 ++++++ .../mysql/V8.3.3_20250120_1546__add_user_hide.sql | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.3.3_20250120_1546__add_user_hide.sql diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java index 5bfc39519..a5a7c8f12 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java @@ -188,6 +188,13 @@ public class SysUser extends BaseExpandFieldEntity implements GetSortKey { @ChineseDescription("租户id") private Long tenantId; + /** + * 是否隐藏：Y-隐藏，N-不隐藏，用在系统内置账号 + */ + @TableField(value = "hidden_flag") + @ChineseDescription("是否隐藏：Y-隐藏，N-不隐藏，用在系统内置账号") + private String hiddenFlag; + //-------------------------------非实体字段------------------------------- //-------------------------------非实体字段------------------------------- //-------------------------------非实体字段------------------------------- diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java index 135481aad..bac2493f7 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -115,6 +115,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 设置用户默认头像 sysUser.setAvatar(FileConstants.DEFAULT_AVATAR_FILE_ID); + // 默认不隐藏 + sysUser.setHiddenFlag(YesOrNotEnum.N.getCode()); + this.save(sysUser); // 记录一个密码修改记录 @@ -936,6 +939,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 数据权限范围控制 UserDataScopeFactory.getUserDataScopeCondition(queryWrapper); + // 查询非隐藏的用户 + queryWrapper.ne(SysUser::getHiddenFlag, YesOrNotEnum.Y.getCode()); + // 按用户排序字段排序 queryWrapper.orderByAsc(SysUser::getUserSort); diff --git a/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.3.3_20250120_1546__add_user_hide.sql b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.3.3_20250120_1546__add_user_hide.sql new file mode 100644 index 000000000..e2b2a28a0 --- /dev/null +++ b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.3.3_20250120_1546__add_user_hide.sql @@ -0,0 +1,2 @@ +ALTER TABLE `sys_user` +ADD COLUMN `hidden_flag` char(1) NULL DEFAULT 'N' COMMENT '是否隐藏：Y-隐藏，N-不隐藏，用在系统内置账号' AFTER `master_user_id`; \ No newline at end of file