diff --git a/src/main/java/com/jsl/oa/controllers/RoleController.java b/src/main/java/com/jsl/oa/controllers/RoleController.java index f8e81f7..200869a 100755 --- a/src/main/java/com/jsl/oa/controllers/RoleController.java +++ b/src/main/java/com/jsl/oa/controllers/RoleController.java @@ -139,4 +139,15 @@ public class RoleController { } return roleService.addRole(request, roleAddVO); } + + + @PutMapping("role/user/change") + public BaseResponse roleChangeUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) { + log.info("请求接口[POST]: /role/user/change"); + // 判断是否有参数错误 + if (uid == null || rid == null) { + return ResultUtil.error(ErrorCode.PARAMETER_ERROR); + } + return roleService.roleChangeUser(request, uid, rid); + } } diff --git a/src/main/java/com/jsl/oa/dao/RoleDAO.java b/src/main/java/com/jsl/oa/dao/RoleDAO.java index 5c6c5d7..df26635 100644 --- a/src/main/java/com/jsl/oa/dao/RoleDAO.java +++ b/src/main/java/com/jsl/oa/dao/RoleDAO.java @@ -53,5 +53,7 @@ public class RoleDAO { return true; } - + public boolean roleChangeUser(Long uid, Long rid) { + return roleMapper.roleChangeUser(uid,rid); + } } diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java index 73f3fbc..78d3675 100644 --- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java +++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java @@ -33,8 +33,12 @@ public interface RoleMapper { @Update("UPDATE organize_oa.oa_role SET role_name=#{roleName},display_name=#{displayName} WHERE id=#{id}") boolean roleEdit(RoleDO getRole); + @Update("UPDATE organize_oa.oa_role_user SET rid = #{rid} WHERE uid = #{uid}") + boolean roleChangeUser(Long uid, Long rid); + @Delete("DELETE FROM organize_oa.oa_role WHERE id=#{id}") boolean roleDelete(Long id); + } diff --git a/src/main/java/com/jsl/oa/services/RoleService.java b/src/main/java/com/jsl/oa/services/RoleService.java index 7509778..4ccf4eb 100644 --- a/src/main/java/com/jsl/oa/services/RoleService.java +++ b/src/main/java/com/jsl/oa/services/RoleService.java @@ -26,4 +26,6 @@ public interface RoleService { BaseResponse roleDelete(HttpServletRequest request, Long id); BaseResponse addRole(HttpServletRequest request, RoleAddVo roleAddVO); + + BaseResponse roleChangeUser(HttpServletRequest request, Long uid, Long rid); } diff --git a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java index 8c9c4fe..64ce7ea 100644 --- a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java @@ -38,6 +38,16 @@ public class RoleServiceImpl implements RoleService { } else return ResultUtil.error(ErrorCode.NOT_ADMIN); } + @Override + public BaseResponse roleChangeUser(HttpServletRequest request, Long uid, Long rid) { + if (Processing.checkUserIsAdmin(request, roleDAO.roleMapper)) { + if(!roleDAO.roleChangeUser(uid, rid)){ + return ResultUtil.error(ErrorCode.DATABASE_UPDATE_ERROR); + } + return ResultUtil.success(); + } else return ResultUtil.error(ErrorCode.NOT_ADMIN); + } + @Override public BaseResponse roleGet(HttpServletRequest request, String id) { // 检查用户权限 @@ -132,4 +142,6 @@ public class RoleServiceImpl implements RoleService { return ResultUtil.success(); } + + }