This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2d7a48b0f0 [fix] Can not query exists environments (#10884)
2d7a48b0f0 is described below
commit 2d7a48b0f059136e160f0a986265d02432701c66
Author: Jiajie Zhong <[email protected]>
AuthorDate: Wed Jul 13 17:21:29 2022 +0800
[fix] Can not query exists environments (#10884)
always return empty set
---
.../api/permission/ResourcePermissionCheckServiceImpl.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
index e7f8ca1449..8450f8e8bb 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
@@ -41,6 +41,7 @@ import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.AccessToken;
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
import org.apache.dolphinscheduler.dao.entity.DataSource;
+import org.apache.dolphinscheduler.dao.entity.Environment;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.Queue;
import org.apache.dolphinscheduler.dao.entity.Resource;
@@ -344,7 +345,11 @@ public class ResourcePermissionCheckServiceImpl implements
ResourcePermissionChe
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
- return Collections.emptySet();
+ List<Environment> environments =
environmentMapper.queryAllEnvironmentList();
+ if (environments.isEmpty()) {
+ return Collections.emptySet();
+ }
+ return
environments.stream().map(Environment::getId).collect(Collectors.toSet());
}
}