lyhzzz 1 سال پیش
والد
کامیت
fdd6051387

+ 3 - 3
src/main/java/com/fdkankan/fusion/common/enums/RoleKeyEnum.java

@@ -1,10 +1,10 @@
 package com.fdkankan.fusion.common.enums;
 
 public enum RoleKeyEnum {
-    ADMIN_SUPER(1,"admin_super" , "超级管理员"),
+    ADMIN_SUPER(1,"admin-super" , "超级管理员"),
     ADMIN(2,"admin" , "平台运营管理员"),
-    ADMIN_DEPT(3,"admin_dept" , "组织总管理员"),
-    ADMIN_ORDINARY(4,"admin_ordinary" , "普通管理员"),
+    ADMIN_DEPT(3,"admin-dept" , "组织总管理员"),
+    ADMIN_ORDINARY(4,"admin-ordinary" , "普通管理员"),
     ;
 
     private Integer id;

+ 2 - 2
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -276,7 +276,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
 
         TmUser loginUser = tmUserService.getLoginUser();
         TmRole tmRole = tmRoleService.getByUserId(loginUser.getId());
-        if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_DEPT.getName())){
+        if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_DEPT.getKey())){
             List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(loginUser.getDeptId());
             List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
             for (String projectDeptId : projectDeptIds) {
@@ -285,7 +285,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
                 }
             }
         }
-        if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_ORDINARY.getName())){
+        if(tmRole.getRoleKey().equals(RoleKeyEnum.ADMIN_ORDINARY.getKey())){
             for (String projectDeptId : projectDeptIds) {
                 if(projectDeptId.equals(loginUser.getDeptId())){
                     throw new BusinessException(ResultCode.NOT_PER);