From 22777ab15948a8741de1c4a88c4396c23987daad Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Fri, 19 Apr 2024 15:50:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=B8=9A=E5=8A=A1):=20=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对权限输入错误的内容进行修改，权限规范化修改 --- .../com/jsl/oa/config/startup/PermissionList.java | 12 ++++++------ .../com/jsl/oa/controllers/ProjectController.java | 6 +++--- src/main/resources/mysql/oa_project_modules.sql | 6 ++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/jsl/oa/config/startup/PermissionList.java b/src/main/java/com/jsl/oa/config/startup/PermissionList.java index 29615c9..2bacdfa 100644 --- a/src/main/java/com/jsl/oa/config/startup/PermissionList.java +++ b/src/main/java/com/jsl/oa/config/startup/PermissionList.java @@ -23,22 +23,22 @@ public class PermissionList { permissionList.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionList.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionList.add(new PermissionVO("info:delete_header_image", "删除头部图片")); - permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); - permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); + permissionList.add(new PermissionVO("project:child_add", "增加子系统")); + permissionList.add(new PermissionVO("project:module_add", "增加子模块")); permissionPrincipal.add(new PermissionVO("auth:change_password", "修改密码")); permissionPrincipal.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionPrincipal.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionPrincipal.add(new PermissionVO("info:delete_header_image", "删除头部图片")); permissionPrincipal.add(new PermissionVO("project:add", "增加项目")); - permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); - permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); + permissionPrincipal.add(new PermissionVO("project:child_add", "增加子系统")); + permissionPrincipal.add(new PermissionVO("project:module_add", "增加子模块")); permissionDeveloper.add(new PermissionVO("auth:change_password", "修改密码")); permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionDeveloper.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionDeveloper.add(new PermissionVO("info:delete_header_image", "删除头部图片")); - permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); - permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); + permissionDeveloper.add(new PermissionVO("project:child_add", "增加子系统")); + permissionDeveloper.add(new PermissionVO("project:module_add", "增加子模块")); } } diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 2537b38..4940c2c 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -1,9 +1,9 @@ package com.jsl.oa.controllers; import com.jsl.oa.annotations.NeedPermission; +import com.jsl.oa.model.vodata.ProjectChildAddVO; import com.jsl.oa.model.vodata.ProjectEditVO; import com.jsl.oa.model.vodata.ProjectInfoVO; -import com.jsl.oa.model.vodata.ProjectChildAddVO; import com.jsl.oa.model.vodata.ProjectModuleAddVO; import com.jsl.oa.model.vodata.business.info.ProjectShowVO; import com.jsl.oa.services.ProjectService; @@ -227,7 +227,7 @@ public class ProjectController { * @return */ @PostMapping("/project/module/add") - @NeedPermission("project:module:add") + @NeedPermission("project:module_add") public BaseResponse projectModuleAdd( @RequestBody @Validated ProjectModuleAddVO projectModuleAddVO, @NotNull BindingResult bindingResult, @@ -248,7 +248,7 @@ public class ProjectController { * @return {@link BaseResponse} */ @PostMapping("/project/child/add") - @NeedPermission("project:child:add") + @NeedPermission("project:child_add") public BaseResponse projectChildAdd( HttpServletRequest request, @RequestBody @Validated ProjectChildAddVO projectChildAddVO, diff --git a/src/main/resources/mysql/oa_project_modules.sql b/src/main/resources/mysql/oa_project_modules.sql index f8b3cc0..2ac88e8 100644 --- a/src/main/resources/mysql/oa_project_modules.sql +++ b/src/main/resources/mysql/oa_project_modules.sql @@ -6,16 +6,14 @@ create table oa_project_modules name varchar(100) not null comment '模块名称', principal_id bigint unsigned not null comment '模块负责人', description json null comment '项目描述（技术选择，描述）', + cycle int unsigned null comment '模块周期', work_load int unsigned default '1' not null comment '工作量（人天）', complete_time datetime null comment '完成时间', created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间', updated_at timestamp null comment '更新时间', is_delete tinyint(1) default 0 not null comment '项目是否删除', - dead_line timestamp not null comment '子模块的截止时间', - status varchar(8) default 'progress' not null comment '模块状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）', constraint oa_project_modules_oa_user_id_fk foreign key (principal_id) references oa_user (id) on update cascade ) - comment '模块表'; - + comment '模块表'; \ No newline at end of file