From ab05b7edcaeab716c6bbff471874af341b3406b5 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <825193156@qq.com>
Date: Mon, 24 Jun 2019 15:20:11 +0800
Subject: [PATCH] datasource and resource for admin operation

---
 .../main/java/cn/escheduler/api/service/DataSourceService.java  | 2 +-
 .../main/java/cn/escheduler/api/service/ResourcesService.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
index 5e6fac13e0..9081a436cf 100644
--- 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;
             }
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
index 0dea2e00d3..b59e43387b 100644
--- 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;
         }