From fb620bbe763efb622a4469a9bad05780ed32cb0a Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 20 Nov 2021 15:57:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AA=E6=9C=89=E7=B3=BB=E7=BB=9F=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007863 --user=刘瑞斌 【系统设置】有系统 - 用户 菜单的权限，查看菜单有报错 https://www.tapd.cn/55049933/s/1071008
---
 .../io/metersphere/controller/GroupController.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/GroupController.java b/backend/src/main/java/io/metersphere/controller/GroupController.java
index 6d7f4883e5..b211491f50 100644
--- a/backend/src/main/java/io/metersphere/controller/GroupController.java
+++ b/backend/src/main/java/io/metersphere/controller/GroupController.java
@@ -34,7 +34,7 @@ public class GroupController {
     private GroupService groupService;
 
     @PostMapping("/get/{goPage}/{pageSize}")
-    @RequiresPermissions(value= {PermissionConstants.SYSTEM_GROUP_READ,PermissionConstants.PROJECT_GROUP_READ}, logical = Logical.OR)
+    @RequiresPermissions(value = {PermissionConstants.SYSTEM_GROUP_READ, PermissionConstants.PROJECT_GROUP_READ}, logical = Logical.OR)
     public Pager<List<GroupDTO>> getGroupList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody EditGroupRequest request) {
         request.setGoPage(goPage);
         request.setPageSize(pageSize);
@@ -47,13 +47,13 @@ public class GroupController {
     }
 
     @PostMapping("/get")
-    @RequiresPermissions(value={PermissionConstants.SYSTEM_GROUP_READ}, logical = Logical.OR)
+    @RequiresPermissions(value = {PermissionConstants.SYSTEM_GROUP_READ, PermissionConstants.SYSTEM_USER_READ}, logical = Logical.OR)
     public List<Group> getGroupByType(@RequestBody EditGroupRequest request) {
         return groupService.getGroupByType(request);
     }
 
     @PostMapping("/add")
-    @RequiresPermissions(value={PermissionConstants.SYSTEM_GROUP_READ_CREATE , PermissionConstants.PROJECT_GROUP_READ_CREATE}, logical = Logical.OR)
+    @RequiresPermissions(value = {PermissionConstants.SYSTEM_GROUP_READ_CREATE, PermissionConstants.PROJECT_GROUP_READ_CREATE}, logical = Logical.OR)
     @MsAuditLog(module = "group_permission", type = OperLogConstants.CREATE, content = "#msClass.getLogDetails(#request.id)", msClass = GroupService.class)
     public Group addGroup(@RequestBody EditGroupRequest request) {
         request.setId(UUID.randomUUID().toString());
@@ -61,14 +61,14 @@ public class GroupController {
     }
 
     @PostMapping("/edit")
-    @RequiresPermissions(value={PermissionConstants.SYSTEM_GROUP_READ_EDIT , PermissionConstants.PROJECT_GROUP_READ_EDIT}, logical = Logical.OR)
+    @RequiresPermissions(value = {PermissionConstants.SYSTEM_GROUP_READ_EDIT, PermissionConstants.PROJECT_GROUP_READ_EDIT}, logical = Logical.OR)
     @MsAuditLog(module = "group_permission", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#request.id)", content = "#msClass.getLogDetails(#request.id)", msClass = GroupService.class)
     public void editGroup(@RequestBody EditGroupRequest request) {
         groupService.editGroup(request);
     }
 
     @GetMapping("/delete/{id}")
-    @RequiresPermissions(value={PermissionConstants.SYSTEM_GROUP_READ_DELETE , PermissionConstants.PROJECT_GROUP_READ_DELETE}, logical = Logical.OR)
+    @RequiresPermissions(value = {PermissionConstants.SYSTEM_GROUP_READ_DELETE, PermissionConstants.PROJECT_GROUP_READ_DELETE}, logical = Logical.OR)
     @MsAuditLog(module = "group_permission", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#id)", msClass = GroupService.class)
     public void deleteGroup(@PathVariable String id) {
         groupService.deleteGroup(id);
@@ -80,7 +80,7 @@ public class GroupController {
     }
 
     @PostMapping("/permission/edit")
-    @RequiresPermissions(value={PermissionConstants.SYSTEM_GROUP_READ_SETTING_PERMISSION , PermissionConstants.PROJECT_GROUP_READ_SETTING_PERMISSION}, logical = Logical.OR)
+    @RequiresPermissions(value = {PermissionConstants.SYSTEM_GROUP_READ_SETTING_PERMISSION, PermissionConstants.PROJECT_GROUP_READ_SETTING_PERMISSION}, logical = Logical.OR)
     public void editGroupPermission(@RequestBody EditGroupRequest editGroupRequest) {
         groupService.editGroupPermission(editGroupRequest);
     }