From d65594e37be2179b60cdc1730819ff156b39639c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 5e3f1e0..a80900d 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
@@ -5,6 +5,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.RoleParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleDetail;
@@ -23,7 +24,7 @@
@RestController
@RequestMapping("/v1/role")
public class RoleController {
-
+ private PermissionConfig permissionConfig;
private final RoleService roleService;
/**
@@ -38,9 +39,14 @@
@GetMapping("/list")
public ResponseVO<Object> listRole(BaseConditionVO conditionVO) {
+ if (!permissionConfig.check("瑙掕壊绠＄悊")) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
List<RoleDetail> roleDetails = roleService.listRole(conditionVO.getPageNo(), conditionVO.getPageSize());
return ResponseUtil.success(roleDetails);
}
+
@PostMapping("/add")
public ResponseVO<Object> addRole(@Validated @RequestBody RoleParam param) {
boolean result = roleService.addRole(param);
--
Gitblit v1.9.3