diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java index 91aff2347f..155595dfe0 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java @@ -1831,7 +1831,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe @Override public Map authorizeResourceTree(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (!resourcePermissionCheckService.functionDisabled()) { + if (resourcePermissionCheckService.functionDisabled()) { putMsg(result, Status.FUNCTION_DISABLED); return result; } @@ -1981,7 +1981,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe @Override public Map unauthorizedUDFFunction(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (!resourcePermissionCheckService.functionDisabled()) { + if (resourcePermissionCheckService.functionDisabled()) { putMsg(result, Status.FUNCTION_DISABLED); return result; } @@ -2019,7 +2019,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe @Override public Map authorizedUDFFunction(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (!resourcePermissionCheckService.functionDisabled()) { + if (resourcePermissionCheckService.functionDisabled()) { putMsg(result, Status.FUNCTION_DISABLED); return result; } @@ -2039,7 +2039,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe @Override public Map authorizedFile(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (!resourcePermissionCheckService.functionDisabled()) { + if (resourcePermissionCheckService.functionDisabled()) { putMsg(result, Status.FUNCTION_DISABLED); return result; } diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java index 21f0a08d21..c052dda741 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java @@ -740,7 +740,7 @@ public class ResourcesServiceTest { // test admin user List resIds = new ArrayList<>(); resIds.add(1); - Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true); + Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false); Mockito.when(resourcesMapper.queryResourceExceptUserId(userId)).thenReturn(getResourceList()); Map result = resourcesService.authorizeResourceTree(user, userId); logger.info(result.toString()); @@ -798,7 +798,7 @@ public class ResourcesServiceTest { int userId = 3; // test admin user - Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true); + Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false); Mockito.when(udfFunctionMapper.queryUdfFuncExceptUserId(userId)).thenReturn(getUdfFuncList()); Mockito.when(udfFunctionMapper.queryAuthedUdfFunc(userId)).thenReturn(getSingleUdfFuncList()); Map result = resourcesService.unauthorizedUDFFunction(user, userId); @@ -826,7 +826,7 @@ public class ResourcesServiceTest { int userId = 3; // test admin user - Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true); + Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false); Mockito.when(udfFunctionMapper.queryAuthedUdfFunc(userId)).thenReturn(getUdfFuncList()); Map result = resourcesService.authorizedUDFFunction(user, userId); logger.info(result.toString()); @@ -855,7 +855,7 @@ public class ResourcesServiceTest { // test admin user List resIds = new ArrayList<>(); resIds.add(1); - Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true); + Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false); Mockito.when(resourceUserMapper.queryResourcesIdListByUserIdAndPerm(Mockito.anyInt(), Mockito.anyInt())) .thenReturn(resIds); Mockito.when(resourcesMapper.queryResourceListById(Mockito.any())).thenReturn(getResourceList());