From e4cc2bad491a85a508f80f93781a1404b3093a07 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 12 Jun 2023 20:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90role=E3=80=91=E6=9B=B4=E6=96=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../role/pojo/request/SysRoleRequest.java | 25 ------------------- .../role/service/impl/SysRoleServiceImpl.java | 5 ++++ 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleRequest.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleRequest.java index 433dbd220..ce5df7fee 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleRequest.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleRequest.java @@ -74,29 +74,4 @@ public class SysRoleRequest extends BaseRequest { @ChineseDescription("是否是系统角色：Y-是，N-否。系统角色不能删除") private String roleSystemFlag; - /** - * 拓展字段 - */ - @ChineseDescription("拓展字段") - private String expandField; - - /** - * 乐观锁 - */ - @ChineseDescription("乐观锁") - private Long versionFlag; - - /** - * 删除标记：Y-已删除，N-未删除 - */ - @NotBlank(message = "删除标记：Y-已删除，N-未删除不能为空", groups = {add.class, edit.class}) - @ChineseDescription("删除标记：Y-已删除，N-未删除") - private String delFlag; - - /** - * 租户号 - */ - @ChineseDescription("租户号") - private Long tenantId; - } diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java index 5b6cf550b..54cd1e96f 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; @@ -32,6 +33,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl public void add(SysRoleRequest sysRoleRequest) { SysRole sysRole = new SysRole(); BeanUtil.copyProperties(sysRoleRequest, sysRole); + + // 设置角色默认的数据范围，默认查看全部 + sysRole.setDataScopeType(DataScopeTypeEnum.ALL.getCode()); + this.save(sysRole); }