WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature-zrx #32

Merged
XiaoLFeng merged 12 commits from feature-zrx into develop 2024-04-19 22:41:30 +08:00
Conversation 0 Commits 12 Files Changed 19 +8 -12
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0719ecf538 - Show all commits

14
src/main/java/com/jsl/oa/config/startup/PermissionList.java
View File

@ -23,19 +23,19 @@ public class PermissionList {
permissionList.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionList.add(new PermissionVO("info:get_header_image", "获取头部图片"));
permissionList.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionList.add(new PermissionVO("info:edit_header_image", "编辑头部图片"));
permissionList.add(new PermissionVO("info:delete_header_image", "删除头部图片")); permissionList.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); permissionList.add(new PermissionVO("project:child_add", "增加子系统"));
permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); permissionList.add(new PermissionVO("project:module_add", "增加子模块"));
permissionPrincipal.add(new PermissionVO("auth:change_password", "修改密码")); permissionPrincipal.add(new PermissionVO("auth:change_password", "修改密码"));
permissionPrincipal.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionPrincipal.add(new PermissionVO("info:get_header_image", "获取头部图片"));
permissionPrincipal.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionPrincipal.add(new PermissionVO("info:edit_header_image", "编辑头部图片"));
permissionPrincipal.add(new PermissionVO("info:delete_header_image", "删除头部图片")); permissionPrincipal.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
permissionPrincipal.add(new PermissionVO("project:add", "增加项目")); permissionPrincipal.add(new PermissionVO("project:add", "增加项目"));
permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); permissionPrincipal.add(new PermissionVO("project:child_add", "增加子系统"));
permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); permissionPrincipal.add(new PermissionVO("project:module_add", "增加子模块"));
permissionPrincipal.add(new PermissionVO("review:add", "添加审核申请")); permissionPrincipal.add(new PermissionVO("review:add", "添加审核申请"));
permissionPrincipal.add(new PermissionVO("daily:add", "添加日报")); permissionPrincipal.add(new PermissionVO("daily:add", "添加日报"));
permissionPrincipal.add(new PermissionVO("project:daily:delete", "删除日报")); permissionPrincipal.add(new PermissionVO("project:daily_delete", "删除日报"));
permissionDeveloper.add(new PermissionVO("auth:change_password", "修改密码")); permissionDeveloper.add(new PermissionVO("auth:change_password", "修改密码"));
permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片"));
@ -43,7 +43,7 @@ public class PermissionList {
permissionDeveloper.add(new PermissionVO("info:delete_header_image", "删除头部图片")); permissionDeveloper.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
permissionDeveloper.add(new PermissionVO("review:add", "添加审核申请")); permissionDeveloper.add(new PermissionVO("review:add", "添加审核申请"));
permissionDeveloper.add(new PermissionVO("daily:add", "添加日报")); permissionDeveloper.add(new PermissionVO("daily:add", "添加日报"));
permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); permissionPrincipal.add(new PermissionVO("project:child_add", "增加子系统"));
permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); permissionPrincipal.add(new PermissionVO("project:module_add", "增加子模块"));
} }
} }

6
src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
View File

@ -52,7 +52,6 @@ public class ProjectDailyController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult)); return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
} }
log.info("请求接口[GET]: /daily/add");
return projectDailyService.addDaily(projectDailyAddVO, request); return projectDailyService.addDaily(projectDailyAddVO, request);
} }
@ -71,10 +70,9 @@ public class ProjectDailyController {
} }
@DeleteMapping("/daily/delete") @DeleteMapping("/daily/delete")
@NeedPermission("project:daily:delete") @NeedPermission("project:daily_delete")
public BaseResponse delete(@RequestParam Integer dailyId, public BaseResponse delete(@RequestParam Integer dailyId,
HttpServletRequest request) { HttpServletRequest request) {
log.info("请求接口[DELETE]: /daily/delete");
return projectDailyService.deleteDaily(dailyId, request); return projectDailyService.deleteDaily(dailyId, request);
} }
@ -83,7 +81,6 @@ public class ProjectDailyController {
public BaseResponse getMyDaily(@RequestParam Integer page, public BaseResponse getMyDaily(@RequestParam Integer page,
@RequestParam Integer pageSize, @RequestParam Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
log.info("请求接口[GET]: /daily/getMyDaily");
return projectDailyService.getMyDaily(page, pageSize, request); return projectDailyService.getMyDaily(page, pageSize, request);
} }
@ -96,7 +93,6 @@ public class ProjectDailyController {
String endTime, String endTime,
HttpServletRequest request) { HttpServletRequest request) {
log.info("请求接口[GET]: /daily/search");
return projectDailyService.searchMyDaily(projectId, return projectDailyService.searchMyDaily(projectId,
page, page,
pageSize, pageSize,