|
@@ -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);
|