【fix bug】去掉无效的权限拦截

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -115,7 +115,6 @@ public class SysUserController {
      * @param req
      * @return
      */
-    @RequiresPermissions("sys:user:list")
     @PermissionData(pageComponent = "system/UserList")
     @GetMapping("/page")
 	public Results<IPage<SysUser>> queryPageList(SysUser user,
@@ -173,7 +172,7 @@ public class SysUserController {
             String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
             SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
 
-            setUser(rsaPrivateKey, user);
+            this.setUserInfo(rsaPrivateKey, user);
 
             // 保存用户走一个service 保证事务
             sysUserService.saveUser(user, selectedRoles, selectedDeparts);
@@ -184,7 +183,12 @@ public class SysUserController {
 		}
 	}
 
-    private void setUser(String rsaPrivateKey, SysUser user) {
+    /**
+     * 给用户信息处理数据，赋基础值
+     * @param rsaPrivateKey
+     * @param user
+     */
+    private void setUserInfo(String rsaPrivateKey, SysUser user) {
         try {
             if (StrUtil.isNotEmpty(user.getEmail())){
                 String email = CommonUtils.decryptBtRsaPriKey(user.getEmail(), rsaPrivateKey);
@@ -251,7 +255,7 @@ public class SysUserController {
         } catch (Exception e) {
             throw new JeroBootException("解密失败！", e);
         }
-//                3:把数据加密在放回来
+        // 3:把数据加密在放回来
         user.setEmail(email);
         user.setPhone(phone);
         user.setUpdateTime(new Date());
@@ -304,8 +308,7 @@ public class SysUserController {
         return Results.OK(OPTION_SUCCESS);
 
     }
-    @RequiresPermissions("sys:user:list")
-//    @RequestMapping(value = "/queryById", method = RequestMethod.GET)
+
     @GetMapping("/queryById")
     public Results<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
         SysUser sysUser = sysUserService.queryById(id);
@@ -316,8 +319,6 @@ public class SysUserController {
         }
     }
 
-    @RequiresPermissions("sys:user:list")
-//    @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
     @GetMapping("/queryUserRole")
     public Results<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
         List<String> list = new ArrayList<>();
@@ -340,8 +341,6 @@ public class SysUserController {
      * @param sysUser
      * @return
      */
-    @RequiresPermissions("sys:user:list")
-//    @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET)
     @GetMapping("/checkOnlyUser")
     public Results<Boolean> checkOnlyUser(SysUser sysUser) {
         Results<Boolean> result = new Results<>();
@@ -371,7 +370,6 @@ public class SysUserController {
      */
 //    @RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
     @PostMapping("/changePassword")
-    @RequiresPermissions("user:edit")
     public Results<T> changePassword(@RequestBody SysUser sysUser) {
         SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
         if (u == null) {
@@ -387,7 +385,6 @@ public class SysUserController {
      * @param userId
      * @return
      */
-    @RequiresPermissions("sys:user:list")
 //    @RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
     @GetMapping("/userDepartList")
     public Results<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
@@ -417,7 +414,6 @@ public class SysUserController {
      *
      * @return
      */
-    @RequiresPermissions("sys:user:list")
 //    @RequestMapping(value = "/generateUserId", method = RequestMethod.GET)
     @GetMapping("/generateUserId")
     public Results<String> generateUserId() {
@@ -435,7 +431,6 @@ public class SysUserController {
      * @param id
      * @return
      */
-    @RequiresPermissions("sys:user:list")
 //    @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
     @GetMapping("/queryUserByDepId")
     public Results<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id, @RequestParam(name="realname",required=false) String realname , @RequestParam(name="username",required=false) String username) {
@@ -484,7 +479,6 @@ public class SysUserController {
      */
 //    @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET)
     @GetMapping("/queryUserComponentData")
-    @RequiresPermissions("sys:user:list")
     public Results<IPage<SysUser>> queryUserComponentData(
             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -669,7 +663,6 @@ public class SysUserController {
 	 */
     //@RequiresPermissions("sys:user:list")
     @GetMapping("/queryByIds")
-    @RequiresPermissions("sys:user:list")
 	public Results<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
 		Results<Collection<SysUser>> result = new Results<>();
 		String[] userId = userIds.split(",");
@@ -716,8 +709,7 @@ public class SysUserController {
 		}
 		return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
 	}
-    @RequiresPermissions("sys:user:list")
-//    @RequestMapping(value = "/userRoleList", method = RequestMethod.GET)
+
     @GetMapping("/userRoleList")
     public Results<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
@@ -741,7 +733,6 @@ public class SysUserController {
      * @return
      */
     @RequiresPermissions("user:add")
-//    @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
     @PostMapping("/addSysUserRole")
     public Results<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
         Results<String> result = new Results<>();
@@ -772,7 +763,6 @@ public class SysUserController {
      * @param
      * @return
      */
-//    @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
     @PostMapping("/deleteUserRole")
     @RequiresPermissions("sys:user:sel")
     public Results<Object> deleteUserRole(@RequestParam(name="roleId") String roleId,
@@ -794,7 +784,6 @@ public class SysUserController {
      * @param
      * @return
      */
-//    @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
     @PostMapping("/deleteUserRoleBatch")
     @RequiresPermissions("sys:user:sel")
     public Results<SysUserRole> deleteUserRoleBatch(
@@ -814,9 +803,7 @@ public class SysUserController {
     /**
      * 部门用户列表
      */
-//    @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
     @GetMapping("/departUserList")
-    @RequiresPermissions("sys:user:list")
     public Results<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
         Results<IPage<SysUser>> result = new Results<>();
@@ -866,7 +853,6 @@ public class SysUserController {
      * 若某个用户包含多个部门，则会显示多条记录，可自行处理成单条记录
      */
     @GetMapping("/queryByOrgCode")
-    @RequiresPermissions("sys:user:list")
     public Results<IPage<SysUserSysDepartModel>> queryByDepartId(
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -881,7 +867,6 @@ public class SysUserController {
      * 给指定部门添加对应的用户
      */
     @RequiresPermissions("user:add")
-//    @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
     @PostMapping("/editSysDepartWithUser")
     public Results<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
         Results<String> result = new Results<>();
@@ -910,7 +895,6 @@ public class SysUserController {
     /**
      *   删除指定机构的用户关系
      */
-//    @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
     @PostMapping("/deleteUserInDepart")
     @RequiresPermissions("sys:user:sel")
     public Results<Object> deleteUserInDepart(@RequestParam(name="depId") String depId,
@@ -930,7 +914,6 @@ public class SysUserController {
     /**
      * 批量删除指定机构的用户关系
      */
-//    @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
     @PostMapping("/deleteUserInDepartBatch")
     @Transactional
     @RequiresPermissions("sys:user:sel")
@@ -957,8 +940,6 @@ public class SysUserController {
          *  查询当前用户的所有部门/当前部门编码
      * @return
      */
-    @RequiresPermissions("sys:user:list")
-//    @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
     @GetMapping("/getCurrentUserDeparts")
     public Results<Map<String,Object>> getCurrentUserDeparts() {
         try {
@@ -975,8 +956,6 @@ public class SysUserController {
     }
 
 
-
-
 	/**
 	 * 用户注册接口
 	 *
@@ -1132,7 +1111,6 @@ public class SysUserController {
 	 *
 	 * @return
 	 */
-    //@RequiresPermissions("sys:user:list")
 	@GetMapping("/getUserSectionInfoByToken")
 	public Results<Map<String, Object>> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
 		try {
@@ -1170,7 +1148,6 @@ public class SysUserController {
 	 * @param pageSize
 	 * @return
 	 */
-    @RequiresPermissions("sys:user:list")
 	@GetMapping("/appUserList")
 	public Results<IPage<SysUser>> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
                                                @RequestParam(name = USER_NAME, required = false) String username,
@@ -1207,7 +1184,6 @@ public class SysUserController {
      *
      * @return logicDeletedUserList
      */
-    @RequiresPermissions("sys:user:list")
     @GetMapping("/recycleBin")
     public Results<List<SysUser>> getRecycleBin() {
         List<SysUser> logicDeletedUserList = sysUserService.queryLogicDeleted();
@@ -1228,8 +1204,6 @@ public class SysUserController {
      * @param jsonObject
      * @return
      */
-    //@RequiresPermissions("sys:user:list")
-//    @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
     @PostMapping("/putRecycleBin")
     @RequiresPermissions("user:edit")
     public Results<T> putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
@@ -1249,7 +1223,6 @@ public class SysUserController {
      * @param userIds 被删除的用户ID，多个id用半角逗号分割
      * @return
      */
-//    @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
     @PostMapping("/deleteRecycleBin")
     @RequiresPermissions("sys:user:sel")
     public Results<T> deleteRecycleBin(@RequestParam("userIds") String userIds) {
@@ -1266,7 +1239,6 @@ public class SysUserController {
      * @return
      */
     @RequiresPermissions("user:edit")
-//    @RequestMapping(value = "/appEdit", method = RequestMethod.PUT)
     @PostMapping("/appEdit")
     public Results<SysUser> appEdit(HttpServletRequest request, @RequestBody JSONObject jsonObject) {
         Results<SysUser> result = new Results<>();
@@ -1290,7 +1262,7 @@ public class SysUserController {
                         return Results.error("手机号已存在!");
                     }
                 }
-                setUser(sysUser, realname, avatar, sex, phone, email, birthday);
+                setUserInfo(sysUser, realname, avatar, sex, phone, email, birthday);
                 sysUserService.updateById(sysUser);
             }
         } catch (Exception e) {
@@ -1300,7 +1272,7 @@ public class SysUserController {
         return result;
     }
 
-    private void setUser(SysUser sysUser, String realname, String avatar, String sex, String phone, String email, Date birthday) {
+    private void setUserInfo(SysUser sysUser, String realname, String avatar, String sex, String phone, String email, Date birthday) {
         if(StringUtils.isNotBlank(realname)){
             sysUser.setRealname(realname);
         }
@@ -1327,7 +1299,6 @@ public class SysUserController {
      * @param clientId
      * @return
      */
-//    @RequestMapping(value = "/saveClientId", method = RequestMethod.GET)
     @PostMapping("/saveClientId")
     public Results<SysUser> saveClientId(HttpServletRequest request, @RequestParam("clientId")String clientId) {
         Results<SysUser> result = new Results<>();
@@ -1352,7 +1323,6 @@ public class SysUserController {
      *
      * @return Result
      */
-    //@RequiresPermissions("sys:user:list")
     @GetMapping("/queryChildrenByUsername")
     public Results<Map<String, Object>> queryChildrenByUsername(@RequestParam("userId") String userId) {
         //获取用户信息
@@ -1419,7 +1389,6 @@ public class SysUserController {
      * @param json
      * @return
      */
-//    @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT)
     @PostMapping("/updateMobile")
     public Results<SysUser> changMobile(@RequestBody JSONObject json, HttpServletRequest request) {
         String smscode = json.getString(SMSCODE);