remove ProcessService add userDao for ResourcePermissionCheckServiceI…

…mpl.EnvironmentResourcePermissionCheck
apache · Sep 23, 2024 · bfe35e0 · bfe35e0
1 parent 472e8dd
commit bfe35e0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...n/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java b/...n/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
@@ -59,6 +59,7 @@
 import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
 import org.apache.dolphinscheduler.dao.mapper.WorkerGroupMapper;
+import org.apache.dolphinscheduler.dao.repository.UserDao;
 import org.apache.dolphinscheduler.service.process.ProcessService;
 
 import java.util.Arrays;
@@ -257,7 +258,7 @@ public static class EnvironmentResourcePermissionCheck implements ResourceAcquis
         private final EnvironmentMapper environmentMapper;
 
         @Autowired
-        private ProcessService processService;
+        private UserDao userDao;
 
         public EnvironmentResourcePermissionCheck(EnvironmentMapper environmentMapper) {
             this.environmentMapper = environmentMapper;
@@ -270,7 +271,11 @@ public List<AuthorizationType> authorizationTypes() {
 
         @Override
         public boolean permissionCheck(int userId, String url, Logger logger) {
-            User user = processService.getUserById(userId);
+            User user = userDao.queryById(userId);
+            if (user == null) {
+                logger.error("User does not exist, userId:{}.", userId);
+                return false;
+            }
             if (user.getUserType() != UserType.ADMIN_USER) {
                 return false;
             }