diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java index 9cee56a1..bf7be553 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java @@ -67,4 +67,14 @@ public class RoleDO extends BaseDO { * 是否为系统内置数据 */ private Boolean isSystem; + + /** + * 菜单选择是否父子节点关联 + */ + private Boolean menuCheckStrictly; + + /** + * 部门选择是否父子节点关联 + */ + private Boolean deptCheckStrictly; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java index 61ebe76c..2efa2ec5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java @@ -90,4 +90,16 @@ public class RoleReq extends BaseReq { */ @Schema(description = "权限范围:部门 ID 列表", example = "5") private List deptIds = new ArrayList<>(); + + /** + * 菜单选择是否父子节点关联 + */ + @Schema(description = "菜单选择是否父子节点关联", example = "false") + private Boolean menuCheckStrictly; + + /** + * 部门选择是否父子节点关联 + */ + @Schema(description = "部门选择是否父子节点关联", example = "false") + private Boolean deptCheckStrictly; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java index 064cc7bf..566fa571 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java @@ -81,6 +81,18 @@ public class RoleDetailResp extends BaseDetailResp { @ExcelProperty(value = "系统内置") private Boolean isSystem; + /** + * 菜单选择是否父子节点关联 + */ + @Schema(description = "菜单选择是否父子节点关联", example = "false") + private Boolean menuCheckStrictly; + + /** + * 部门选择是否父子节点关联 + */ + @Schema(description = "部门选择是否父子节点关联", example = "false") + private Boolean deptCheckStrictly; + /** * 描述 */ diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql b/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql index 2829b6d4..09feb98e 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql @@ -2,3 +2,8 @@ -- changeset Charles7c:3.3-1 ALTER TABLE `gen_field_config` ADD COLUMN `dict_code` varchar(30) DEFAULT NULL COMMENT '字典编码' AFTER `query_type`; + +-- changeset Charles7c:3.3-2 +ALTER TABLE `sys_role` + ADD COLUMN `menu_check_strictly` bit(1) DEFAULT b'0' COMMENT '菜单选择是否父子节点关联' AFTER `is_system`, + ADD COLUMN `dept_check_strictly` bit(1) DEFAULT b'0' COMMENT '部门选择是否父子节点关联' AFTER `menu_check_strictly`; diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql b/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql index d20a9959..f132e7eb 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_column.sql @@ -1,5 +1,12 @@ -- liquibase formatted sql -- changeset Charles7c:3.3-1 -ALTER TABLE "gen_field_config" ADD COLUMN `dict_code` varchar(30) DEFAULT NULL COMMENT '字典编码' AFTER `query_type`; +ALTER TABLE "gen_field_config" ADD COLUMN "dict_code" varchar(30) DEFAULT NULL; COMMENT ON COLUMN "gen_field_config"."dict_code" IS '字典编码'; + +-- changeset Charles7c:3.3-2 +ALTER TABLE "sys_role" + ADD COLUMN "menu_check_strictly" bool DEFAULT false, + ADD COLUMN "dept_check_strictly" bool DEFAULT false; +COMMENT ON COLUMN "sys_role"."menu_check_strictly" IS '菜单选择是否父子节点关联'; +COMMENT ON COLUMN "sys_role"."dept_check_strictly" IS '部门选择是否父子节点关联';