From 136f5314c8083096a982d229e4e4812a58a72aea Mon Sep 17 00:00:00 2001 From: liao Date: Sat, 6 May 2023 15:58:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=2068476=20=E3=80=90=E5=9E=82=E7=9B=B4?= =?UTF-8?q?=E8=B6=8A=E6=9D=83=E3=80=91=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E8=B6=8A=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) 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 27c41521..15614156 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 @@ -254,6 +254,7 @@ public class SysUserController { } @PostMapping("/delete") + @RequiresPermissions("sys:user:sel") public Results delete(@RequestBody Map map) { String id = map.get("id"); if(StringUtils.isBlank(id)){ @@ -265,6 +266,7 @@ public class SysUserController { } @PostMapping("/deleteBatch") + @RequiresPermissions("sys:user:sel") public Results deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); if(StringUtils.isBlank(ids)){ @@ -276,7 +278,7 @@ public class SysUserController { } - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("user:edit") @PostMapping("/frozenBatch") public Results frozenBatch(@RequestBody JSONObject jsonObject) { try { @@ -296,7 +298,7 @@ public class SysUserController { return Results.OK(OPTION_SUCCESS); } - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/queryById", method = RequestMethod.GET) @GetMapping("/queryById") public Results queryById(@RequestParam(name = "id", required = true) String id) { @@ -308,7 +310,7 @@ public class SysUserController { } } - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) @GetMapping("/queryUserRole") public Results> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { @@ -332,7 +334,7 @@ public class SysUserController { * @param sysUser * @return */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET) @GetMapping("/checkOnlyUser") public Results checkOnlyUser(SysUser sysUser) { @@ -363,6 +365,7 @@ public class SysUserController { */ // @RequestMapping(value = "/changePassword", method = RequestMethod.PUT) @PostMapping("/changePassword") + @RequiresPermissions("user:edit") public Results changePassword(@RequestBody SysUser sysUser) { SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, sysUser.getUsername())); if (u == null) { @@ -378,7 +381,7 @@ public class SysUserController { * @param userId * @return */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/userDepartList", method = RequestMethod.GET) @GetMapping("/userDepartList") public Results> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) { @@ -408,7 +411,7 @@ public class SysUserController { * * @return */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/generateUserId", method = RequestMethod.GET) @GetMapping("/generateUserId") public Results generateUserId() { @@ -426,7 +429,7 @@ public class SysUserController { * @param id * @return */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) @GetMapping("/queryUserByDepId") public Results> queryUserByDepId(@RequestParam(name = "id", required = true) String id, @RequestParam(name="realname",required=false) String realname , @RequestParam(name="username",required=false) String username) { @@ -475,6 +478,7 @@ public class SysUserController { */ // @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET) @GetMapping("/queryUserComponentData") + @RequiresPermissions("sys:user:list") public Results> queryUserComponentData( @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -638,6 +642,7 @@ public class SysUserController { */ //@RequiresPermissions("sys:user:list") @GetMapping("/queryByIds") + @RequiresPermissions("sys:user:list") public Results> queryByIds(@RequestParam String userIds) { Results> result = new Results<>(); String[] userId = userIds.split(","); @@ -655,6 +660,7 @@ public class SysUserController { * 首页用户重置密码 */ @PostMapping("/updatePassword") + @RequiresPermissions("user:edit") public Results updatePassword(@RequestBody JSONObject json) { String username = json.getString(USER_NAME); String oldpassword = json.getString("oldpassword"); @@ -683,7 +689,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) @GetMapping("/userRoleList") public Results> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -741,6 +747,7 @@ public class SysUserController { */ // @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE) @PostMapping("/deleteUserRole") + @RequiresPermissions("sys:user:sel") public Results deleteUserRole(@RequestParam(name="roleId") String roleId, @RequestParam(name="userId",required=true) String userId) { try { @@ -762,6 +769,7 @@ public class SysUserController { */ // @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE) @PostMapping("/deleteUserRoleBatch") + @RequiresPermissions("sys:user:sel") public Results deleteUserRoleBatch( @RequestParam(name="roleId") String roleId, @RequestParam(name="userIds",required=true) String userIds) { @@ -781,7 +789,7 @@ public class SysUserController { */ // @RequestMapping(value = "/departUserList", method = RequestMethod.GET) @GetMapping("/departUserList") - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") public Results> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Results> result = new Results<>(); @@ -831,7 +839,7 @@ public class SysUserController { * 若某个用户包含多个部门，则会显示多条记录，可自行处理成单条记录 */ @GetMapping("/queryByOrgCode") - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") public Results> queryByDepartId( @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @@ -877,6 +885,7 @@ public class SysUserController { */ // @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE) @PostMapping("/deleteUserInDepart") + @RequiresPermissions("sys:user:sel") public Results deleteUserInDepart(@RequestParam(name="depId") String depId, @RequestParam(name="userId",required=true) String userId) { try { @@ -897,6 +906,7 @@ public class SysUserController { // @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) @PostMapping("/deleteUserInDepartBatch") @Transactional + @RequiresPermissions("sys:user:sel") public Results deleteUserInDepartBatch( @RequestParam(name="depId") String depId, @RequestParam(name="userIds",required=true) String userIds) { @@ -920,7 +930,7 @@ public class SysUserController { * 查询当前用户的所有部门/当前部门编码 * @return */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") // @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) @GetMapping("/getCurrentUserDeparts") public Results> getCurrentUserDeparts() { @@ -1133,7 +1143,7 @@ public class SysUserController { * @param pageSize * @return */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") @GetMapping("/appUserList") public Results> appUserList(@RequestParam(name = "keyword", required = false) String keyword, @RequestParam(name = USER_NAME, required = false) String username, @@ -1170,7 +1180,7 @@ public class SysUserController { * * @return logicDeletedUserList */ - //@RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:list") @GetMapping("/recycleBin") public Results> getRecycleBin() { List logicDeletedUserList = sysUserService.queryLogicDeleted(); @@ -1194,6 +1204,7 @@ public class SysUserController { //@RequiresPermissions("sys:user:list") // @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT) @PostMapping("/putRecycleBin") + @RequiresPermissions("user:edit") public Results putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { String userIds = jsonObject.getString("userIds"); if (StringUtils.isNotBlank(userIds)) { @@ -1213,6 +1224,7 @@ public class SysUserController { */ // @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE) @PostMapping("/deleteRecycleBin") + @RequiresPermissions("sys:user:sel") public Results deleteRecycleBin(@RequestParam("userIds") String userIds) { if (StringUtils.isNotBlank(userIds)) { sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));