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 dd010afa..105e4462 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 @@ -90,7 +90,7 @@ public class SysRoleController { * @param req * @return */ - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysRole role, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -182,7 +182,7 @@ public class SysRoleController { * @param id * @return */ - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @RequestMapping(value = "/queryById", method = RequestMethod.GET) public Result queryById(@RequestParam(name="id",required=true) String id) { SysRole sysRole = sysRoleService.getById(id); @@ -192,7 +192,7 @@ public class SysRoleController { return Result.OK(sysRole); } } - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @RequestMapping(value = "/queryall", method = RequestMethod.GET) public Result> queryall() { List list = sysRoleService.list(); @@ -206,7 +206,7 @@ public class SysRoleController { /** * 校验角色编码唯一 */ - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET) public Result checkUsername(String id,String roleCode) { Result result = new Result<>(); @@ -299,7 +299,7 @@ public class SysRoleController { /** * 查询数据规则数据 */ - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @GetMapping(value = "/datarule/{permissionId}/{roleId}") public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) { List list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); @@ -329,7 +329,7 @@ public class SysRoleController { /** * 保存数据规则至角色菜单关联表 */ - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @PostMapping(value = "/datarule") public Result saveDatarule(@RequestBody JSONObject jsonObject) { try { @@ -360,7 +360,7 @@ public class SysRoleController { * @param request * @return */ - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) public Result> queryTreeList(HttpServletRequest request) { Result> result = new Result<>(); @@ -386,7 +386,7 @@ public class SysRoleController { } return result; } - @RequiresPermissions("sys:role:list") + //@RequiresPermissions("sys:role:list") private void getTreeModelList(List treeList,List metaList,TreeModel temp) { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index f902d9bc..bdf588eb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -95,7 +95,7 @@ public class SysUserController { * @param req * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @PermissionData(pageComponent = "system/UserList") @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysUser user, @@ -238,7 +238,7 @@ public class SysUserController { } - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) public Result frozenBatch(@RequestBody JSONObject jsonObject) { try { @@ -258,7 +258,7 @@ public class SysUserController { return Result.OK("操作成功!"); } - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/queryById", method = RequestMethod.GET) public Result queryById(@RequestParam(name = "id", required = true) String id) { SysUser sysUser = sysUserService.getById(id); @@ -269,7 +269,7 @@ public class SysUserController { } } - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) public Result> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { List list = new ArrayList(); @@ -292,7 +292,7 @@ public class SysUserController { * @param sysUser * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET) public Result checkOnlyUser(SysUser sysUser) { Result result = new Result<>(); @@ -336,7 +336,7 @@ public class SysUserController { * @param userId * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/userDepartList", method = RequestMethod.GET) public Result> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) { Result> result = new Result<>(); @@ -365,7 +365,7 @@ public class SysUserController { * * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/generateUserId", method = RequestMethod.GET) public Result generateUserId() { Result result = new Result<>(); @@ -382,7 +382,7 @@ public class SysUserController { * @param id * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) public Result> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) { Result> result = new Result<>(); @@ -548,7 +548,7 @@ public class SysUserController { * @param userIds * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/queryByIds", method = RequestMethod.GET) public Result> queryByIds(@RequestParam String userIds) { Result> result = new Result<>(); @@ -592,7 +592,7 @@ public class SysUserController { } return sysUserService.resetPassword(username,oldpassword,password,confirmpassword); } - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/userRoleList", method = RequestMethod.GET) public Result> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -682,7 +682,7 @@ public class SysUserController { * 部门用户列表 */ @RequestMapping(value = "/departUserList", method = RequestMethod.GET) - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") public Result> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); @@ -729,7 +729,7 @@ public class SysUserController { * 若某个用户包含多个部门,则会显示多条记录,可自行处理成单条记录 */ @GetMapping("/queryByOrgCode") - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") public Result queryByDepartId( @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @@ -815,7 +815,7 @@ public class SysUserController { * 查询当前用户的所有部门/当前部门编码 * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) public Result> getCurrentUserDeparts() { try { @@ -989,7 +989,7 @@ public class SysUserController { * * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @GetMapping("/getUserSectionInfoByToken") public Result getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) { try { @@ -1027,7 +1027,7 @@ public class SysUserController { * @param pageSize * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @GetMapping("/appUserList") public Result appUserList(@RequestParam(name = "keyword", required = false) String keyword, @RequestParam(name = "username", required = false) String username, @@ -1064,7 +1064,7 @@ public class SysUserController { * * @return logicDeletedUserList */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @GetMapping("/recycleBin") public Result getRecycleBin() { List logicDeletedUserList = sysUserService.queryLogicDeleted(); @@ -1085,7 +1085,7 @@ public class SysUserController { * @param jsonObject * @return */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT) public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { String userIds = jsonObject.getString("userIds"); @@ -1198,7 +1198,7 @@ public class SysUserController { * * @return Result */ - @RequiresPermissions("sys:user:list") + //@RequiresPermissions("sys:user:list") @GetMapping("/queryChildrenByUsername") public Result queryChildrenByUsername(@RequestParam("userId") String userId) { //获取用户信息