diff --git a/src/main/java/com/jsl/oa/controllers/RoleController.java b/src/main/java/com/jsl/oa/controllers/RoleController.java index bb81360..39ed16e 100755 --- a/src/main/java/com/jsl/oa/controllers/RoleController.java +++ b/src/main/java/com/jsl/oa/controllers/RoleController.java @@ -9,6 +9,7 @@ import org.springframework.lang.Nullable; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.validation.constraints.NotNull; /** *

角色控制器

@@ -43,12 +44,12 @@ public class RoleController { * @return */ @PostMapping("role/user/add") - public BaseResponse roleAddUser(@RequestParam Long uid, @RequestParam Long rid) { + public BaseResponse roleAddUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) { // 判断是否有参数错误 if (uid == null || rid == null) { return ResultUtil.error(ErrorCode.PARAMETER_ERROR); } - return roleService.roleAddUser(uid, rid); + return roleService.roleAddUser(request,uid, rid); } /** @@ -57,11 +58,11 @@ public class RoleController { * @return */ @DeleteMapping("role/user/remove") - public BaseResponse roleRemoveUser(@RequestParam Long uid) { + public BaseResponse roleRemoveUser(HttpServletRequest request,@RequestParam Long uid) { // 判断是否有参数错误 if (uid == null) { return ResultUtil.error(ErrorCode.PARAMETER_ERROR); } - return roleService.roleRemoveUser(uid); + return roleService.roleRemoveUser(request,uid); } } diff --git a/src/main/java/com/jsl/oa/services/RoleService.java b/src/main/java/com/jsl/oa/services/RoleService.java index 7da9e3b..908b4d6 100644 --- a/src/main/java/com/jsl/oa/services/RoleService.java +++ b/src/main/java/com/jsl/oa/services/RoleService.java @@ -13,9 +13,9 @@ import javax.servlet.http.HttpServletRequest; * @since v1.1.0 */ public interface RoleService { - BaseResponse roleAddUser(Long uid, Long rid); + BaseResponse roleAddUser(HttpServletRequest request,Long uid, Long rid); - BaseResponse roleRemoveUser(Long uid); + BaseResponse roleRemoveUser(HttpServletRequest request,Long uid); BaseResponse roleGet(HttpServletRequest request, String id); } 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 2e1ef48..b7956fb 100644 --- a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java @@ -20,22 +20,21 @@ import java.util.regex.Pattern; public class RoleServiceImpl implements RoleService { private final RoleDAO roleDAO; - private final UserDAO userDAO; @Override - public BaseResponse roleAddUser(Long uid, Long rid) { - if (userDAO.isExistUser(uid)) { + public BaseResponse roleAddUser(HttpServletRequest request,Long uid, Long rid) { + if (Processing.checkUserIsAdmin(request,roleDAO.roleMapper)) { roleDAO.roleAddUser(uid, rid); return ResultUtil.success(); - } else return ResultUtil.error(ErrorCode.USER_NOT_EXIST); + } else return ResultUtil.error(ErrorCode.NOT_ADMIN); } @Override - public BaseResponse roleRemoveUser(Long uid) { - if (userDAO.isExistUser(uid)) { + public BaseResponse roleRemoveUser(HttpServletRequest request,Long uid) { + if (Processing.checkUserIsAdmin(request,roleDAO.roleMapper)) { roleDAO.roleRemoveUser(uid); return ResultUtil.success(); - } else return ResultUtil.error(ErrorCode.USER_NOT_EXIST); + } else return ResultUtil.error(ErrorCode.NOT_ADMIN); } @Override