wangxx 1 mês atrás
pai
commit
48ea257bc6

+ 0 - 2
airport-common/src/main/java/com/sundot/airport/common/enums/RoleTypeEnum.java

@@ -11,8 +11,6 @@ import lombok.Getter;
11 11
 public enum RoleTypeEnum {
12 12
 
13 13
     admin("admin", "超级管理员"),
14
-    guanliyuan("guanliyuan", "管理员"),
15
-    bumenjingli("bumenjingli", "部门经理"),
16 14
     common("common", "普通角色"),
17 15
     test("test", "站长"),
18 16
     zhijianke("zhijianke", "质检科"),

+ 2 - 5
airport-framework/src/main/java/com/sundot/airport/framework/interceptor/RequestSourceInterceptor.java

@@ -59,11 +59,8 @@ public class RequestSourceInterceptor implements HandlerInterceptor {
59 59
 
60 60
             List<SysRole> sysRoleList = loginUser.getUser().getRoles();
61 61
             Set<String> roles = sysRoleList.stream().map(SysRole::getRoleKey).collect(Collectors.toSet());
62
-            if (!roles.contains(RoleTypeEnum.admin.getCode()) && !roles.contains(RoleTypeEnum.test.getCode())
63
-                    && !roles.contains(RoleTypeEnum.zhijianke.getCode()) && !roles.contains(RoleTypeEnum.jingli.getCode())
64
-                    && !roles.contains(RoleTypeEnum.xingzheng.getCode()) && !roles.contains(RoleTypeEnum.guanliyuan.getCode())
65
-                     && !roles.contains(RoleTypeEnum.bumenjingli.getCode())) {
66
-                throw new ServiceException("仅超级管理员、管理员、站长、质检科、经理、部门经理、大队行政角色可访问web端", HttpStatus.FORBIDDEN);
62
+            if (!roles.contains(RoleTypeEnum.admin.getCode()) && !roles.contains(RoleTypeEnum.test.getCode()) && !roles.contains(RoleTypeEnum.zhijianke.getCode()) && !roles.contains(RoleTypeEnum.jingli.getCode()) && !roles.contains(RoleTypeEnum.xingzheng.getCode())) {
63
+                throw new ServiceException("仅超级管理员、站长、质检科、经理、大队行政角色可访问web端", HttpStatus.FORBIDDEN);
67 64
             }
68 65
         }
69 66