Skip to content

Commit 387fb19

Browse files
committed
feat: 修改角色支持衔接新增角色时的父子联动
1 parent ca9f34d commit 387fb19

File tree

5 files changed

+47
-1
lines changed

5 files changed

+47
-1
lines changed

continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,14 @@ public class RoleDO extends BaseDO {
6767
* 是否为系统内置数据
6868
*/
6969
private Boolean isSystem;
70+
71+
/**
72+
* 菜单选择是否父子节点关联
73+
*/
74+
private Boolean menuCheckStrictly;
75+
76+
/**
77+
* 部门选择是否父子节点关联
78+
*/
79+
private Boolean deptCheckStrictly;
7080
}

continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,16 @@ public class RoleReq extends BaseReq {
9090
*/
9191
@Schema(description = "权限范围:部门 ID 列表", example = "5")
9292
private List<Long> deptIds = new ArrayList<>();
93+
94+
/**
95+
* 菜单选择是否父子节点关联
96+
*/
97+
@Schema(description = "菜单选择是否父子节点关联", example = "false")
98+
private Boolean menuCheckStrictly;
99+
100+
/**
101+
* 部门选择是否父子节点关联
102+
*/
103+
@Schema(description = "部门选择是否父子节点关联", example = "false")
104+
private Boolean deptCheckStrictly;
93105
}

continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,18 @@ public class RoleDetailResp extends BaseDetailResp {
8181
@ExcelProperty(value = "系统内置")
8282
private Boolean isSystem;
8383

84+
/**
85+
* 菜单选择是否父子节点关联
86+
*/
87+
@Schema(description = "菜单选择是否父子节点关联", example = "false")
88+
private Boolean menuCheckStrictly;
89+
90+
/**
91+
* 部门选择是否父子节点关联
92+
*/
93+
@Schema(description = "部门选择是否父子节点关联", example = "false")
94+
private Boolean deptCheckStrictly;
95+
8496
/**
8597
* 描述
8698
*/

continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_column.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22

33
-- changeset Charles7c:3.3-1
44
ALTER TABLE `gen_field_config` ADD COLUMN `dict_code` varchar(30) DEFAULT NULL COMMENT '字典编码' AFTER `query_type`;
5+
6+
-- changeset Charles7c:3.3-2
7+
ALTER TABLE `sys_role`
8+
ADD COLUMN `menu_check_strictly` bit(1) DEFAULT b'0' COMMENT '菜单选择是否父子节点关联' AFTER `is_system`,
9+
ADD COLUMN `dept_check_strictly` bit(1) DEFAULT b'0' COMMENT '部门选择是否父子节点关联' AFTER `menu_check_strictly`;
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
-- liquibase formatted sql
22

33
-- changeset Charles7c:3.3-1
4-
ALTER TABLE "gen_field_config" ADD COLUMN `dict_code` varchar(30) DEFAULT NULL COMMENT '字典编码' AFTER `query_type`;
4+
ALTER TABLE "gen_field_config" ADD COLUMN "dict_code" varchar(30) DEFAULT NULL;
55
COMMENT ON COLUMN "gen_field_config"."dict_code" IS '字典编码';
6+
7+
-- changeset Charles7c:3.3-2
8+
ALTER TABLE "sys_role"
9+
ADD COLUMN "menu_check_strictly" bool DEFAULT false,
10+
ADD COLUMN "dept_check_strictly" bool DEFAULT false;
11+
COMMENT ON COLUMN "sys_role"."menu_check_strictly" IS '菜单选择是否父子节点关联';
12+
COMMENT ON COLUMN "sys_role"."dept_check_strictly" IS '部门选择是否父子节点关联';

0 commit comments

Comments
 (0)