From f9de1d0ed0190627eb343f22ace4423019cddf5f Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 15 Nov 2021 15:30:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BB=84=E5=92=8C=E9=A1=B9=E7=9B=AE=E7=94=A8=E6=88=B7=E7=BB=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V99__v1.15_release.sql | 34 +++++++++++-------- backend/src/main/resources/permission.json | 5 +++ .../components/project/menu/UserGroup.vue | 6 ++-- .../settings/system/group/UserGroup.vue | 8 ++--- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/backend/src/main/resources/db/migration/V99__v1.15_release.sql b/backend/src/main/resources/db/migration/V99__v1.15_release.sql index de700e9307..e14a7d1232 100644 --- a/backend/src/main/resources/db/migration/V99__v1.15_release.sql +++ b/backend/src/main/resources/db/migration/V99__v1.15_release.sql @@ -1,19 +1,23 @@ -CREATE TABLE `issue_follow` ( - `issue_id` varchar(50) DEFAULT NULL, - `follow_id` varchar(50) DEFAULT NULL, - UNIQUE KEY `issue_follow_pk` (`issue_id`,`follow_id`), - KEY `issue_follow_follow_id_index` (`follow_id`), - KEY `issue_follow_issue_id_index` (`issue_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +CREATE TABLE `issue_follow` +( + `issue_id` varchar(50) DEFAULT NULL, + `follow_id` varchar(50) DEFAULT NULL, + UNIQUE KEY `issue_follow_pk` (`issue_id`, `follow_id`), + KEY `issue_follow_follow_id_index` (`follow_id`), + KEY `issue_follow_issue_id_index` (`issue_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; -- group -insert into user_group_permission (id, group_id, permission_id, module_id) -values (UUID(), 'project_group', 'PROJECT_GROUP:READ', 'PROJECT_GROUP'); -insert into user_group_permission (id, group_id, permission_id, module_id) -values (UUID(), 'project_group', 'PROJECT_GROUP:READ+CREATE', 'PROJECT_GROUP'); -insert into user_group_permission (id, group_id, permission_id, module_id) -values (UUID(), 'project_group', 'PROJECT_GROUP:READ+EDIT', 'PROJECT_GROUP'); -insert into user_group_permission (id, group_id, permission_id, module_id) -values (UUID(), 'project_group', 'PROJECT_GROUP:READ+DELETE', 'PROJECT_GROUP'); +INSERT INTO user_group_permission (id, group_id, permission_id, module_id) +VALUES (UUID(), 'project_group', 'PROJECT_GROUP:READ', 'PROJECT_GROUP'); +INSERT INTO user_group_permission (id, group_id, permission_id, module_id) +VALUES (UUID(), 'project_group', 'PROJECT_GROUP:READ+CREATE', 'PROJECT_GROUP'); +INSERT INTO user_group_permission (id, group_id, permission_id, module_id) +VALUES (UUID(), 'project_group', 'PROJECT_GROUP:READ+EDIT', 'PROJECT_GROUP'); +INSERT INTO user_group_permission (id, group_id, permission_id, module_id) +VALUES (UUID(), 'project_group', 'PROJECT_GROUP:READ+DELETE', 'PROJECT_GROUP'); +INSERT INTO user_group_permission (id, group_id, permission_id, module_id) +VALUES (UUID(), 'project_group', 'PROJECT_GROUP:READ+SETTING_PERMISSION', 'PROJECT_GROUP'); diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json index 243a048ac0..0bc45b5462 100644 --- a/backend/src/main/resources/permission.json +++ b/backend/src/main/resources/permission.json @@ -305,6 +305,11 @@ "name": "删除用户组与权限", "resourceId": "PROJECT_GROUP" }, + { + "id": "PROJECT_GROUP:READ+SETTING_PERMISSION", + "name": "设置权限", + "resourceId": "PROJECT_GROUP" + }, { "id": "PROJECT_MANAGER:READ", "name": "查询项目", diff --git a/frontend/src/business/components/project/menu/UserGroup.vue b/frontend/src/business/components/project/menu/UserGroup.vue index 0ca5fb7a7a..79feffbd1d 100644 --- a/frontend/src/business/components/project/menu/UserGroup.vue +++ b/frontend/src/business/components/project/menu/UserGroup.vue @@ -45,13 +45,13 @@