WFC/agt-cloud
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "refactor: 超级管理员内置菜单补充"

Browse Source 
This reverts commit 704c2270f5.
This commit is contained in:
caiyuchao
2025-08-14 18:21:16 +08:00
parent cc3554dc16
commit bd02d002e8
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/PermissionController.java
View File

@@ -2,7 +2,6 @@ package org.agt.module.system.controller.admin.permission;
import cn.hutool.core.collection.CollUtil;
import org.agt.framework.common.pojo.CommonResult;
import org.agt.framework.web.core.util.WebFrameworkUtils;
import org.agt.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleDataScopeReqVO;
import org.agt.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleMenuReqVO;
import org.agt.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO;
@@ -17,11 +16,7 @@ import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.Arrays;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import static org.agt.framework.common.pojo.CommonResult.success;
@@ -45,13 +40,7 @@ public class PermissionController {
@GetMapping("/list-role-menus")
@PreAuthorize("@ss.hasPermission('system:permission:assign-role-menu')")
public CommonResult<Set<Long>> getRoleMenuList(Long roleId) {
Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(roleId);
Integer[] filterMenuIds = {1138, 1139, 1140, 1141, 1142, 1143, 1224, 1225, 1226, 1227, 1228, 1229, 5010, 108, 500, 501, 1040, 1042, 1043, 1045, 107, 1036, 1037, 1038, 1039, 1093, 1094, 1095, 1096, 1097, 1098, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2739, 109, 1046, 1048, 1261, 1263, 1264, 1265, 1266, 1267, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2083, 2, 106, 110, 114, 115, 116, 1031, 1032, 1033, 1034, 1035, 1050, 1051, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1060, 1070, 1075, 1083, 1084, 1085, 1086, 1087, 1089, 1243, 1255, 1256, 1257, 1258, 1259, 1260, 2472, 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 2492, 2493, 2494, 2495, 2497, 2525, 2740,1237,1238,1239,1240,1241,1242,111,1078,1082,1088,113,1066,1067,112,1077,1090,1091,1092};
if (WebFrameworkUtils.getLoginUserId() != 2) {
menuIds = menuIds.stream().filter(item -> Arrays.stream(filterMenuIds).noneMatch(m -> Objects.equals(Long.valueOf(m), item))
).collect(Collectors.toSet());
}
return success(menuIds);
return success(permissionService.getRoleMenuListByRoleId(roleId));
}
@PostMapping("/assign-role-menu")