datasource and resource for admin operation

5 years ago · ab05b7edca
2 changed files with 2 additions and 2 deletions
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
@ -538,7 +538,7 @@ public class DataSourceService extends BaseService{
                putMsg(result, Status.RESOURCE_NOT_EXIST);
                return result;
            }
-            if(loginUser.getId() != dataSource.getUserId() || loginUser.getUserType() != UserType.ADMIN_USER){
+            if(loginUser.getId() != dataSource.getUserId() && loginUser.getUserType() != UserType.ADMIN_USER){
                putMsg(result, Status.USER_NO_OPERATION_PERM);
                return result;
            }
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
@ -400,7 +400,7 @@ public class ResourcesService extends BaseService {
            putMsg(result, Status.RESOURCE_NOT_EXIST);
            return result;
        }
-        if (loginUser.getId() != resource.getUserId() || loginUser.getUserType() != UserType.ADMIN_USER) {
+        if (loginUser.getId() != resource.getUserId() && loginUser.getUserType() != UserType.ADMIN_USER) {
            putMsg(result, Status.USER_NO_OPERATION_PERM);
            return result;
        }