From a6afa4b5e1a919f752660911866b25a9cb8312f6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 20 五月 2022 14:11:38 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
index a80900d..a9035da 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.controller;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
@@ -9,8 +8,8 @@
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleDetail;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +31,9 @@
*/
@GetMapping("/getRoleListByAdmin/{adminId}")
public ResponseVO<Object> getRoleListByAdmin(@PathVariable Long adminId) {
+ if (!permissionConfig.check(MenuEnum.ROLE_BY_ADMIN.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<Role> roles = roleService.listByAdminId(adminId);
return ResponseUtil.success(roles);
}
@@ -39,7 +41,7 @@
@GetMapping("/list")
public ResponseVO<Object> listRole(BaseConditionVO conditionVO) {
- if (!permissionConfig.check("瑙掕壊绠＄悊")) {
+ if (!permissionConfig.check(MenuEnum.ROLE_MANAGER.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -49,6 +51,9 @@
@PostMapping("/add")
public ResponseVO<Object> addRole(@Validated @RequestBody RoleParam param) {
+ if (!permissionConfig.check(MenuEnum.ROLE_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = roleService.addRole(param);
if (result) {
return ResponseUtil.success("娣诲姞鎴愬姛");
@@ -59,6 +64,9 @@
@PostMapping("/update/{roleId}")
public ResponseVO<Object> updateRole(@PathVariable Long roleId, @Validated @RequestBody RoleParam param) {
+ if (!permissionConfig.check(MenuEnum.ROLE_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = roleService.updateRole(roleId, param);
if (result) {
return ResponseUtil.success("缂栬緫鎴愬姛");
@@ -69,6 +77,9 @@
@PostMapping("/del/{roleId}")
public ResponseVO<Object> delRole(@PathVariable Long roleId) {
+ if (!permissionConfig.check(MenuEnum.ROLE_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = roleService.delRole(roleId);
if (result) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.3