diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 12a5f824..71ed6cb3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -229,7 +229,6 @@ public class SysPermissionController { * @param permission * @return */ - //@RequiresRoles({ "admin" }) @PostMapping("/add") @RequiresPermissions("permission:add") public Results add(@RequestBody SysPermission permission) { @@ -248,7 +247,6 @@ public class SysPermissionController { * @param permission * @return */ - //@RequiresRoles({ "admin" }) @PostMapping("/edit") @RequiresPermissions("permission:edit") public Results edit(@RequestBody SysPermission permission) { @@ -391,7 +389,6 @@ public class SysPermissionController { */ @PostMapping("/saveRolePermission") @RequiresPermissions("permission:add") - //@RequiresRoles({ "admin" }) public Results saveRolePermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); try { @@ -675,7 +672,6 @@ public class SysPermissionController { * @param sysPermissionDataRule * @return */ - //@RequiresRoles({ "admin" }) @PostMapping("/addPermissionRule") @RequiresPermissions("permission:add") public Results addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { @@ -689,7 +685,6 @@ public class SysPermissionController { } } - //@RequiresRoles({ "admin" }) @PostMapping("/editPermissionRule") @RequiresPermissions("permission:edit") public Results editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { @@ -708,7 +703,6 @@ public class SysPermissionController { * @param map * @return */ - //@RequiresRoles({ "admin" }) @PostMapping("/deletePermissionRule") @RequiresPermissions("permission:delete") public Results deletePermissionRule(@RequestBody Map map) { @@ -767,7 +761,6 @@ public class SysPermissionController { */ @PostMapping("/saveDepartPermission") @RequiresPermissions("permission:add") - //@RequiresRoles({ "admin" }) public Results saveDepartPermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); try { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 77efd451..aa2af362 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -81,7 +81,6 @@ public class SysRoleController { * @param req * @return */ - @RequiresPermissions("sys:role:list") @GetMapping("/page") public Results> queryPageList(SysRole role, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -103,7 +102,6 @@ public class SysRoleController { */ @RequiresPermissions("sys:role:add") @PostMapping("/add") - //@RequiresRoles({"admin"}) public Results add(@RequestBody SysRole role) { try { role.setCreateTime(new Date()); @@ -120,7 +118,6 @@ public class SysRoleController { * @param role * @return */ - //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:edit") @PostMapping("/edit") public Results edit(@RequestBody SysRole role) { @@ -143,7 +140,6 @@ public class SysRoleController { * @param map * @return */ - //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") @PostMapping("/delete") public Results delete(@RequestBody Map map) { @@ -160,7 +156,6 @@ public class SysRoleController { * @param map * @return */ - //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") @PostMapping("/deleteBatch") public Results deleteBatch(@RequestBody Map map) { @@ -181,7 +176,6 @@ public class SysRoleController { * @param id * @return */ - @RequiresPermissions("sys:role:list") @GetMapping("/queryById") public Results queryById(@RequestParam(name="id",required=true) String id) { SysRole sysRole = sysRoleService.getById(id); @@ -191,7 +185,7 @@ public class SysRoleController { return Results.OK(sysRole); } } - @RequiresPermissions("sys:role:list") + @GetMapping("/queryall") public Results> queryall() { List list = sysRoleService.list(); @@ -205,7 +199,6 @@ public class SysRoleController { /** * 校验角色编码唯一 */ - @RequiresPermissions("sys:role:list") @GetMapping("/checkRoleCode") public Results checkUsername(String id, String roleCode) { Results result = new Results<>(); @@ -292,7 +285,6 @@ public class SysRoleController { /** * 查询数据规则数据 */ - @RequiresPermissions("sys:role:list") @GetMapping(value = "/datarule/{permissionId}/{roleId}") public Results> loadDatarule(@PathVariable("permissionId") String permissionId, @PathVariable("roleId") String roleId) { List list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); @@ -320,7 +312,6 @@ public class SysRoleController { /** * 保存数据规则至角色菜单关联表 */ - @RequiresPermissions("sys:role:list") @PostMapping(value = "/datarule") public Results saveDatarule(@RequestBody JSONObject jsonObject) { try { @@ -351,7 +342,6 @@ public class SysRoleController { * @param request * @return */ - @RequiresPermissions("sys:role:list") @GetMapping("/queryTreeList") public Results> queryTreeList(HttpServletRequest request) { Results> result = new Results<>(); @@ -377,7 +367,7 @@ public class SysRoleController { } return result; } - @RequiresPermissions("sys:role:list") + private void getTreeModelList(List treeList,List metaList,TreeModel temp) { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); @@ -397,5 +387,4 @@ public class SysRoleController { } } - }